]> err.no Git - linux-2.6/commitdiff
time: don't touch an offlined CPU's ts->tick_stopped in tick_cancel_sched_timer()
authorKarsten Wiese <fzu@wemgehoertderstaat.de>
Tue, 4 Mar 2008 22:59:55 +0000 (14:59 -0800)
committerThomas Gleixner <tglx@linutronix.de>
Sun, 9 Mar 2008 07:42:57 +0000 (08:42 +0100)
Silences WARN_ONs in rcu_enter_nohz() and rcu_exit_nohz(), which appeared
before caused by (repeated) calls to:
        $ echo 0 > /sys/devices/system/cpu/cpu1/online
        $ echo 1 > /sys/devices/system/cpu/cpu1/online

Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Cc: johnstul@us.ibm.com
Cc: Rafael Wysocki <rjw@sisk.pl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@elte.hu>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/time/tick-sched.c

index 2968298f8f364923010c440fe68f6e02d2f32e2a..686da821d376b01dd21d379bfd8baf39d6b106f1 100644 (file)
@@ -640,7 +640,7 @@ void tick_cancel_sched_timer(int cpu)
 
        if (ts->sched_timer.base)
                hrtimer_cancel(&ts->sched_timer);
-       ts->tick_stopped = 0;
+
        ts->nohz_mode = NOHZ_MODE_INACTIVE;
 }
 #endif /* HIGH_RES_TIMERS */