The patch titled timer: print function name for timer callbacks modifying preemption count has been added to the -mm tree. Its filename is timer-print-function-name-for-timer-callbacks-modifying-preemption-count.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: timer: print function name for timer callbacks modifying preemption count From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> 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. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN kernel/timer.c~timer-print-function-name-for-timer-callbacks-modifying-preemption-count kernel/timer.c --- a/kernel/timer.c~timer-print-function-name-for-timer-callbacks-modifying-preemption-count +++ a/kernel/timer.c @@ -1084,10 +1084,10 @@ static inline void __run_timers(struct t lock_map_release(&lockdep_map); if (preempt_count != preempt_count()) { - printk(KERN_ERR "huh, entered %p " + printk(KERN_ERR "huh, entered %p (%pF)" "with preempt_count %08x, exited" " with %08x?\n", - fn, preempt_count, + fn, fn, preempt_count, preempt_count()); BUG(); } _ Patches currently in -mm which might be from u.kleine-koenig@xxxxxxxxxxxxxx are origin.patch linux-next.patch hrtimer-correct-a-few-numbers-in-comments.patch clockevents-ensure-taht-min_delta_ns-is-increased-in-error-path.patch timer-print-function-name-for-timer-callbacks-modifying-preemption-count.patch genirq-warn-about-irqf_sharedirqf_disabled-at-the-right-place.patch rtc-pcf2123-move-pcf2123_remove-to-devexittext.patch rtc-hctosys-only-claim-the-rtc-provided-the-system-time-if-it-did.patch w1-mxc_w1-move-probe-and-remove-to-the-dev-text-area.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html