The patch titled softirq: improve preempt count error message has been added to the -mm tree. Its filename is softirq-improve-preempt-count-error-message.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: softirq: improve preempt count error message From: Jiri Slaby <jslaby@xxxxxxx> * add a space after the action * print function name instead of address of action (%p->%pf) Signed-off-by: Jiri Slaby <jslaby@xxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/softirq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN kernel/softirq.c~softirq-improve-preempt-count-error-message kernel/softirq.c --- a/kernel/softirq.c~softirq-improve-preempt-count-error-message +++ a/kernel/softirq.c @@ -219,8 +219,8 @@ restart: h->action(h); trace_softirq_exit(h, softirq_vec); if (unlikely(prev_count != preempt_count())) { - printk(KERN_ERR "huh, entered softirq %td %s %p" - "with preempt_count %08x," + printk(KERN_ERR "huh, entered softirq %td %s " + "%pf with preempt_count %08x," " exited with %08x?\n", h - softirq_vec, softirq_to_name[h - softirq_vec], h->action, prev_count, preempt_count()); _ Patches currently in -mm which might be from jslaby@xxxxxxx are origin.patch linux-next.patch hpet-unmap-unused-i-o-space.patch softirq-improve-preempt-count-error-message.patch leds-route-kbd-leds-through-the-generic-leds-layer.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