aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-03-11 14:04:46 -0800
committerThomas Gleixner <tglx@linutronix.de>2010-03-12 22:40:42 +0100
commit06f71b922ce5a05352acd706564ca4ae1f2add0e (patch)
tree36e2febfdb380364f1df10c48560695d8406635f
parent64ce4c2f5252f25798117fa80a027993163d6d84 (diff)
timer: Print function name for timer callbacks modifying preemption count
A function scheduled with a timer must not exit with a different preempt count than it was entered. To make helping users running into the corresponding BUG() easier also print the name of the bad function not only its address. [ tglx: Sanitized printk ] Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: johnstul@us.ibm.com Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--kernel/timer.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index c61a7949387..f82f4bfe2d8 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1027,11 +1027,8 @@ static inline void __run_timers(struct tvec_base *base)
lock_map_release(&lockdep_map);
if (preempt_count != preempt_count()) {
- printk(KERN_ERR "huh, entered %p "
- "with preempt_count %08x, exited"
- " with %08x?\n",
- fn, preempt_count,
- preempt_count());
+ printk(KERN_ERR "timer: %pF preempt leak: %08x -> %08x\n",
+ fn, preempt_count, preempt_count());
BUG();
}
}