diff options
| author | Thiemo Seufer <ths@networkno.de> | 2007-08-20 23:43:49 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-08-27 02:16:59 +0100 |
| commit | 34412c7231f513283ab501eea41774b4ae623dcc (patch) | |
| tree | 24b4d974ac0c78ac23c46fd79399cfbb819e9209 /arch/mips | |
| parent | 97ce9a8d6c9b50ea38f45d05a73fded2e0701ddf (diff) | |
| download | lwn-34412c7231f513283ab501eea41774b4ae623dcc.tar.gz lwn-34412c7231f513283ab501eea41774b4ae623dcc.zip | |
[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>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/traps.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index c8e291c83057..d6103e510899 100644 --- 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 */ |