diff options
author | Karsten Wiese <fzu@wemgehoertderstaat.de> | 2008-03-04 17:59:55 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-03-09 03:42:57 -0400 |
commit | a79017660ea4597ec489fab3b5aaf71dd776dfc7 (patch) | |
tree | 87fedadc8d003391c9ccf5d3cf0aba69fb8e443d /kernel/time/tick-sched.c | |
parent | 38332cb98772f5ea757e6486bed7ed0381cb5f98 (diff) |
time: don't touch an offlined CPU's ts->tick_stopped in tick_cancel_sched_timer()
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>
Diffstat (limited to 'kernel/time/tick-sched.c')
-rw-r--r-- | kernel/time/tick-sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 2968298f8f36..686da821d376 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
@@ -640,7 +640,7 @@ void tick_cancel_sched_timer(int cpu) | |||
640 | 640 | ||
641 | if (ts->sched_timer.base) | 641 | if (ts->sched_timer.base) |
642 | hrtimer_cancel(&ts->sched_timer); | 642 | hrtimer_cancel(&ts->sched_timer); |
643 | ts->tick_stopped = 0; | 643 | |
644 | ts->nohz_mode = NOHZ_MODE_INACTIVE; | 644 | ts->nohz_mode = NOHZ_MODE_INACTIVE; |
645 | } | 645 | } |
646 | #endif /* HIGH_RES_TIMERS */ | 646 | #endif /* HIGH_RES_TIMERS */ |