diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /kernel/time/tick-sched.c | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'kernel/time/tick-sched.c')
| -rw-r--r-- | kernel/time/tick-sched.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 3e216e01bbd..c55ea243347 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
| @@ -642,8 +642,7 @@ static void tick_nohz_switch_to_nohz(void) | |||
| 642 | } | 642 | } |
| 643 | local_irq_enable(); | 643 | local_irq_enable(); |
| 644 | 644 | ||
| 645 | printk(KERN_INFO "Switched to NOHz mode on CPU #%d\n", | 645 | printk(KERN_INFO "Switched to NOHz mode on CPU #%d\n", smp_processor_id()); |
| 646 | smp_processor_id()); | ||
| 647 | } | 646 | } |
| 648 | 647 | ||
| 649 | /* | 648 | /* |
| @@ -795,8 +794,10 @@ void tick_setup_sched_timer(void) | |||
| 795 | } | 794 | } |
| 796 | 795 | ||
| 797 | #ifdef CONFIG_NO_HZ | 796 | #ifdef CONFIG_NO_HZ |
| 798 | if (tick_nohz_enabled) | 797 | if (tick_nohz_enabled) { |
| 799 | ts->nohz_mode = NOHZ_MODE_HIGHRES; | 798 | ts->nohz_mode = NOHZ_MODE_HIGHRES; |
| 799 | printk(KERN_INFO "Switched to NOHz mode on CPU #%d\n", smp_processor_id()); | ||
| 800 | } | ||
| 800 | #endif | 801 | #endif |
| 801 | } | 802 | } |
| 802 | #endif /* HIGH_RES_TIMERS */ | 803 | #endif /* HIGH_RES_TIMERS */ |