x86-64: honor notify_die() returning NOTIFY_STOP

This requires making die() return a value, making its callers honor
this (and be prepared that it may return), and making oops_end() have
two additional parameters.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index 8cd47fe2ef2c..bc6e35153d83 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -192,10 +192,10 @@ void do_machine_check(struct pt_regs * regs, long error_code)
 
         atomic_inc(&mce_entry);
 
-        if (regs)
-                notify_die(DIE_NMI, "machine check", regs, error_code, 18,
-                           SIGKILL);
-        if (!banks)
+        if ((regs
+             && notify_die(DIE_NMI, "machine check", regs, error_code,
+                           18, SIGKILL) == NOTIFY_STOP)
+            || !banks)
                 goto out2;
 
         memset(&m, 0, sizeof(struct mce));