Commit 27630532 authored Apr 15, 2014 by Viresh Kumar Committed by Thomas Gleixner Apr 15, 2014

tick-sched: Check tick_nohz_enabled in tick_nohz_switch_to_nohz()



Since commit d689fe22 (NOHZ: Check for nohz active instead of nohz
enabled) the tick_nohz_switch_to_nohz() function returns because it
checks for the tick_nohz_active flag. This can't be set, because the
function itself sets it.

Undo the change in tick_nohz_switch_to_nohz().

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: linaro-kernel@lists.linaro.org
Cc: fweisbec@gmail.com
Cc: Arvind.Chauhan@arm.com
Cc: linaro-networking@linaro.org
Cc: <stable@vger.kernel.org> # 3.13+
Link: http://lkml.kernel.org/r/40939c05f2d65d781b92b20302b02243d0654224.1397537987.git.viresh.kumar@linaro.org


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 03e6bdc5

kernel/time/tick-sched.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -970,7 +970,7 @@ static void tick_nohz_switch_to_nohz(void)
		struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched);
		ktime_t next;

		if (!tick_nohz_active)
		if (!tick_nohz_enabled)
		return;

		local_irq_disable();