Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=34412c7231f513283ab501eea41774b4ae623dcc
Commit:     34412c7231f513283ab501eea41774b4ae623dcc
Parent:     97ce9a8d6c9b50ea38f45d05a73fded2e0701ddf
Author:     Thiemo Seufer <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 20 23:43:49 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Mon Aug 27 02:16:59 2007 +0100

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 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 c8e291c..d6103e5 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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to