Merge branch 'akpm-current/current'

[karo-tx-linux.git] / arch / arm / kernel / smp.c

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index baee70267f2939367ab412a8adaa5df929bb3f10..2dfb52a0263b13c64e344a37801cb99dd77b1bd9 100644 (file)
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -645,7 +645,9 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
 
        case IPI_CPU_BACKTRACE:
                irq_enter();
+               printk_nmi_enter();
                nmi_cpu_backtrace(regs);
+               printk_nmi_exit();
                irq_exit();
                break;