Commit-ID: 27630532ef5ead28b98cfe28d8f95222ef91c2b7 Gitweb: http://git.kernel.org/tip/27630532ef5ead28b98cfe28d8f95222ef91c2b7 Author: Viresh Kumar <viresh.kumar@xxxxxxxxxx> AuthorDate: Tue, 15 Apr 2014 10:54:41 +0530 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Tue, 15 Apr 2014 20:26:58 +0200 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@xxxxxxxxxx> Cc: linaro-kernel@xxxxxxxxxxxxxxxx Cc: fweisbec@xxxxxxxxx Cc: Arvind.Chauhan@xxxxxxx Cc: linaro-networking@xxxxxxxxxx Cc: <stable@xxxxxxxxxxxxxxx> # 3.13+ Link: http://lkml.kernel.org/r/40939c05f2d65d781b92b20302b02243d0654224.1397537987.git.viresh.kumar@xxxxxxxxxx Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> --- kernel/time/tick-sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|