Commit-ID: fe96565ce90aca25786d709ebb5fb5e49b8bbafe Gitweb: http://git.kernel.org/tip/fe96565ce90aca25786d709ebb5fb5e49b8bbafe Author: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> AuthorDate: Tue, 18 Jan 2011 22:46:34 -0800 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Wed, 19 Jan 2011 12:08:44 +0100 hrtimers: Notify hrtimer users of switches to NOHZ mode When NOHZ=y and high res timers are disabled (via cmdline or Kconfig) tick_nohz_switch_to_nohz() will notify the user about switching into NOHZ mode. Nothing is printed for the case where HIGH_RES_TIMERS=y. Fix this for the HIGH_RES_TIMERS=y case by duplicating the printk from the low res NOHZ path in the high res NOHZ path. This confused me since I was thinking 'dmesg | grep -i NOHZ' would tell me if NOHZ was enabled, but if I have hrtimers there is nothing. Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> LKML-Reference: <1295419594-13085-1-git-send-email-sboyd@xxxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- kernel/time/tick-sched.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 3e216e0..9760f4f 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -640,10 +640,8 @@ static void tick_nohz_switch_to_nohz(void) break; next = ktime_add(next, tick_period); } + printk(KERN_INFO "Switched to NOHz mode on CPU #%d\n", smp_processor_id()); local_irq_enable(); - - printk(KERN_INFO "Switched to NOHz mode on CPU #%d\n", - smp_processor_id()); } /* @@ -795,8 +793,11 @@ void tick_setup_sched_timer(void) } #ifdef CONFIG_NO_HZ - if (tick_nohz_enabled) + if (tick_nohz_enabled) { ts->nohz_mode = NOHZ_MODE_HIGHRES; + pr_info("Switched to NOHz mode on CPU #%d\n", + smp_processor_id()); + } #endif } #endif /* HIGH_RES_TIMERS */ -- 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