diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-05 15:04:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-05 15:04:16 -0400 |
| commit | e69a9ac59629db81971a9e03048f9a107712947a (patch) | |
| tree | 3b9959180e882009bd3b73f14b9435bc30594088 /kernel | |
| parent | 0f26ec69f0c4071a8dfa3c2ac8e180a79355f81a (diff) | |
| parent | d3f6302e7e51b41af86c6496ffb2f95e8f2179df (diff) | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
hrtimer: Remove overly verbose "switch to high res mode" message
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/hrtimer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 6d7020490f94..3e1c36e7998f 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
| @@ -726,8 +726,6 @@ static int hrtimer_switch_to_hres(void) | |||
| 726 | /* "Retrigger" the interrupt to get things going */ | 726 | /* "Retrigger" the interrupt to get things going */ |
| 727 | retrigger_next_event(NULL); | 727 | retrigger_next_event(NULL); |
| 728 | local_irq_restore(flags); | 728 | local_irq_restore(flags); |
| 729 | printk(KERN_DEBUG "Switched to high resolution mode on CPU %d\n", | ||
| 730 | smp_processor_id()); | ||
| 731 | return 1; | 729 | return 1; |
| 732 | } | 730 | } |
| 733 | 731 | ||