[MIPS] SMTC: Fix duplicate status dumps on NMI

Also removes the while(1); loop by propagating the ATTRIB_NORET of die()
to nmi_exception_handler.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index c8e291c83057bb1020b01092c5a7f64b2e96c521..d6103e51089997b80f9b4a799b00eb85c8b1f6f3 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1035,19 +1035,11 @@ void ejtag_exception_handler(struct pt_regs *regs)
 /*
  * NMI exception handler.
  */
-void nmi_exception_handler(struct pt_regs *regs)
+NORET_TYPE void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
 {
-#ifdef CONFIG_MIPS_MT_SMTC
-       unsigned long dvpret = dvpe();
        bust_spinlocks(1);
        printk("NMI taken!!!!\n");
-       mips_mt_regdump(dvpret);
-#else
-       bust_spinlocks(1);
-       printk("NMI taken!!!!\n");
-#endif /* CONFIG_MIPS_MT_SMTC */
        die("NMI", regs);
-       while(1) ;
 }
 
 #define VECTORSPACING 0x100    /* for EI/VI mode */