Merge branch 'akpm-current/current'

[karo-tx-linux.git] / include / linux / hardirq.h

diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index dfd59d6bc6f0f74ef89b0512a25180fd0077e2d3..a477e0766d2e625e88c0dad7f7a551136b6eca68 100644 (file)
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -67,10 +67,12 @@ extern void irq_exit(void);
                preempt_count_add(NMI_OFFSET + HARDIRQ_OFFSET); \
                rcu_nmi_enter();                                \
                trace_hardirq_enter();                          \
+               printk_nmi_enter();                             \
        } while (0)
 
 #define nmi_exit()                                             \
        do {                                                    \
+               printk_nmi_exit();                              \
                trace_hardirq_exit();                           \
                rcu_nmi_exit();                                 \
                BUG_ON(!in_nmi());                              \