summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-05 12:04:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-05 12:04:16 -0700
commite69a9ac59629db81971a9e03048f9a107712947a (patch)
tree3b9959180e882009bd3b73f14b9435bc30594088 /kernel
parent0f26ec69f0c4071a8dfa3c2ac8e180a79355f81a (diff)
parentd3f6302e7e51b41af86c6496ffb2f95e8f2179df (diff)
downloadblackbird-op-linux-e69a9ac59629db81971a9e03048f9a107712947a.tar.gz
blackbird-op-linux-e69a9ac59629db81971a9e03048f9a107712947a.zip
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.c2
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)
/* "Retrigger" the interrupt to get things going */
retrigger_next_event(NULL);
local_irq_restore(flags);
- printk(KERN_DEBUG "Switched to high resolution mode on CPU %d\n",
- smp_processor_id());
return 1;
}
OpenPOWER on IntegriCloud