Commit 34412c72 authored by Thiemo Seufer's avatar Thiemo Seufer Committed by Ralf Baechle
Browse files

[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: default avatarThiemo Seufer <ths@networkno.de>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 97ce9a8d

arch/mips/kernel/traps.c

+1 −9
Original line number Diff line number Diff line
@@ -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 */