Commit a7901766 authored Mar 04, 2008 by Karsten Wiese Committed by Thomas Gleixner Mar 09, 2008

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>

parent 38332cb9

kernel/time/tick-sched.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -640,7 +640,7 @@ void tick_cancel_sched_timer(int cpu)

	if (ts->sched_timer.base)		if (ts->sched_timer.base)
	hrtimer_cancel(&ts->sched_timer);		hrtimer_cancel(&ts->sched_timer);
	ts->tick_stopped = 0;
	ts->nohz_mode = NOHZ_MODE_INACTIVE;		ts->nohz_mode = NOHZ_MODE_INACTIVE;
	}		}
	#endif /* HIGH_RES_TIMERS */		#endif /* HIGH_RES_TIMERS */