| From 27630532ef5ead28b98cfe28d8f95222ef91c2b7 Mon Sep 17 00:00:00 2001 |
| From: Viresh Kumar <viresh.kumar@linaro.org> |
| Date: Tue, 15 Apr 2014 10:54:41 +0530 |
| Subject: tick-sched: Check tick_nohz_enabled in tick_nohz_switch_to_nohz() |
| |
| From: Viresh Kumar <viresh.kumar@linaro.org> |
| |
| 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/kernel/time/tick-sched.c |
| +++ b/kernel/time/tick-sched.c |
| @@ -970,7 +970,7 @@ static void tick_nohz_switch_to_nohz(voi |
| 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(); |
