aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2008-01-30 07:30:00 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:00 -0500
commit4c9dc6412247abf4972080c51cd16a58c4009c19 (patch)
treea6c9b22da4ff5537219c03fbbfc919b95a27df2a /kernel/timer.c
parenta6fa8e5a6172a5a5bc06ed04f34e50b36c978127 (diff)
time: timer cleanups
Small cleanups to tick-related code. Wrong preempt count is followed by BUG(), so it is hardly KERN_WARNING. Signed-off-by: Pavel Machek <pavel@suse.cz> Cc: john stultz <johnstul@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index aadfbc8367f5..23f7ead78fae 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -655,7 +655,7 @@ static inline void __run_timers(struct tvec_base *base)
655 int preempt_count = preempt_count(); 655 int preempt_count = preempt_count();
656 fn(data); 656 fn(data);
657 if (preempt_count != preempt_count()) { 657 if (preempt_count != preempt_count()) {
658 printk(KERN_WARNING "huh, entered %p " 658 printk(KERN_ERR "huh, entered %p "
659 "with preempt_count %08x, exited" 659 "with preempt_count %08x, exited"
660 " with %08x?\n", 660 " with %08x?\n",
661 fn, preempt_count, 661 fn, preempt_count,