Skip to content

Commit

Permalink
[MIPS] SMTC: Fix duplicate status dumps on NMI
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thiemo Seufer authored and Ralf Baechle committed Aug 27, 2007
1 parent 97ce9a8 commit 34412c7
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions arch/mips/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 34412c7

Please sign in to comment.