[PATCH] i386: pass proper trap numbers to die chain handlers

Pass the trap number causing the call to notify_die() to the die
notification handler chain in a number of instances.  Also, honor the
return value from the handler chain invocation in die() as, through a
debugger, the fault may have been fixed.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-By: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 12 insertions, 5 deletions

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index de5386b01d38..4624f8ca2459 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -386,8 +386,12 @@ void die(const char * str, struct pt_regs * regs, long err)
 #endif
                 if (nl)
                         printk("\n");
-        notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV);
-                show_registers(regs);
+                if (notify_die(DIE_OOPS, str, regs, err,
+                                        current->thread.trap_no, SIGSEGV) !=
+                                NOTIFY_STOP)
+                        show_registers(regs);
+                else
+                        regs = NULL;
         } else
                 printk(KERN_EMERG "Recursive die() failure, output suppressed\n");
 
@@ -395,6 +399,9 @@ void die(const char * str, struct pt_regs * regs, long err)
         die.lock_owner = -1;
         spin_unlock_irqrestore(&die.lock, flags);
 
+        if (!regs)
+                return;
+
         if (kexec_should_crash(current))
                 crash_kexec(regs);
 
@@ -623,7 +630,7 @@ static DEFINE_SPINLOCK(nmi_print_lock);
 
 void die_nmi (struct pt_regs *regs, const char *msg)
 {
-        if (notify_die(DIE_NMIWATCHDOG, msg, regs, 0, 0, SIGINT) ==
+        if (notify_die(DIE_NMIWATCHDOG, msg, regs, 0, 2, SIGINT) ==
             NOTIFY_STOP)
                 return;
 
@@ -662,7 +669,7 @@ static void default_do_nmi(struct pt_regs * regs)
                 reason = get_nmi_reason();
  
         if (!(reason & 0xc0)) {
-                if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason, 0, SIGINT)
+                if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason, 2, SIGINT)
                                                         == NOTIFY_STOP)
                         return;
 #ifdef CONFIG_X86_LOCAL_APIC
@@ -678,7 +685,7 @@ static void default_do_nmi(struct pt_regs * regs)
                 unknown_nmi_error(reason, regs);
                 return;
         }
-        if (notify_die(DIE_NMI, "nmi", regs, reason, 0, SIGINT) == NOTIFY_STOP)
+        if (notify_die(DIE_NMI, "nmi", regs, reason, 2, SIGINT) == NOTIFY_STOP)
                 return;
         if (reason & 0x80)
                 mem_parity_error(reason, regs);