1 files changed, 18 insertions, 2 deletions

diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c
index d8d5750d6106..44c8af65325e 100644
--- a/arch/x86_64/kernel/crash.c
+++ b/arch/x86_64/kernel/crash.c
@@ -23,6 +23,7 @@
 #include <asm/nmi.h>
 #include <asm/hw_irq.h>
 #include <asm/mach_apic.h>
+#include <asm/kdebug.h>
 
 /* This keeps a track of which one is crashing cpu. */
 static int crashing_cpu;
@@ -95,8 +96,18 @@ static void crash_save_self(struct pt_regs *regs)
 #ifdef CONFIG_SMP
 static atomic_t waiting_for_crash_ipi;
 
-static int crash_nmi_callback(struct pt_regs *regs, int cpu)
+static int crash_nmi_callback(struct notifier_block *self,
+                                unsigned long val, void *data)
 {
+        struct pt_regs *regs;
+        int cpu;
+
+        if (val != DIE_NMI)
+                return NOTIFY_OK;
+
+        regs = ((struct die_args *)data)->regs;
+        cpu = raw_smp_processor_id();
+
         /*
          * Don't do anything if this handler is invoked on crashing cpu.
          * Otherwise, system will completely hang. Crashing cpu can get
@@ -127,12 +138,17 @@ static void smp_send_nmi_allbutself(void)
  * cpu hotplug shouldn't matter.
  */
 
+static struct notifier_block crash_nmi_nb = {
+        .notifier_call = crash_nmi_callback,
+};
+
 static void nmi_shootdown_cpus(void)
 {
         unsigned long msecs;
 
         atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);
-        set_nmi_callback(crash_nmi_callback);
+        if (register_die_notifier(&crash_nmi_nb))
+                return;         /* return what? */
 
         /*
          * Ensure the new callback function is set before sending