diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2014-04-15 10:54:41 +0530 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-04-15 20:26:58 +0200 |
| commit | 27630532ef5ead28b98cfe28d8f95222ef91c2b7 (patch) | |
| tree | 6f7b01c349a27acd39a35de246c3b78b01b726ab /kernel/time | |
| parent | 03e6bdc5c4d0fc166bfd5d3cf749a5a0c1b5b1bd (diff) | |
| download | op-kernel-dev-27630532ef5ead28b98cfe28d8f95222ef91c2b7.zip op-kernel-dev-27630532ef5ead28b98cfe28d8f95222ef91c2b7.tar.gz | |
tick-sched: Check tick_nohz_enabled in tick_nohz_switch_to_nohz()
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
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>
Diffstat (limited to 'kernel/time')
| -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 e947d96..6558b7a 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -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(); |
