Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[deliverable/linux.git] / include / linux / hardirq.h

diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index dfd59d6bc6f0f74ef89b0512a25180fd0077e2d3..c683996110b15f1ca45e9b7499fc983a036c5b96 100644 (file)
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -61,6 +61,7 @@ extern void irq_exit(void);
 
 #define nmi_enter()                                            \
        do {                                                    \
+               printk_nmi_enter();                             \
                lockdep_off();                                  \
                ftrace_nmi_enter();                             \
                BUG_ON(in_nmi());                               \
@@ -77,6 +78,7 @@ extern void irq_exit(void);
                preempt_count_sub(NMI_OFFSET + HARDIRQ_OFFSET); \
                ftrace_nmi_exit();                              \
                lockdep_on();                                   \
+               printk_nmi_exit();                              \
        } while (0)
 
 #endif /* LINUX_HARDIRQ_H */