tick-sched: Check tick_nohz_enabled in tick_nohz_switch_to_nohz()
authorViresh Kumar <viresh.kumar@linaro.org>
Tue, 15 Apr 2014 05:24:41 +0000 (10:54 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 May 2014 20:20:28 +0000 (13:20 -0700)
commit669d557d58abebcc1de06cf7f2686612df6adc5c
treec3ba9603cdd4592b78f639709e83fec632d82d53
parentf13588b86969b02e3d74b55ac04956461f898a3d
tick-sched: Check tick_nohz_enabled in tick_nohz_switch_to_nohz()

commit 27630532ef5ead28b98cfe28d8f95222ef91c2b7 upstream.

Since commit d689fe222 (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
Link: http://lkml.kernel.org/r/40939c05f2d65d781b92b20302b02243d0654224.1397537987.git.viresh.kumar@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/time/tick-sched.c