x86, nmi: Wire up NMI handlers to new routines

[karo-tx-linux.git] / arch / x86 / kernel / cpu / mcheck / mce-inject.c

diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
index 0ed633c5048b174849a6993932d02442645ef68e..6199232161cffa181d6cf80605adb38dfbb51a61 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
+++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
@@ -78,27 +78,20 @@ static void raise_exception(struct mce *m, struct pt_regs *pregs)
 
 static cpumask_var_t mce_inject_cpumask;
 
-static int mce_raise_notify(struct notifier_block *self,
-                           unsigned long val, void *data)
+static int mce_raise_notify(unsigned int cmd, struct pt_regs *regs)
 {
-       struct die_args *args = (struct die_args *)data;
        int cpu = smp_processor_id();
        struct mce *m = &__get_cpu_var(injectm);
-       if (val != DIE_NMI || !cpumask_test_cpu(cpu, mce_inject_cpumask))
-               return NOTIFY_DONE;
+       if (!cpumask_test_cpu(cpu, mce_inject_cpumask))
+               return NMI_DONE;
        cpumask_clear_cpu(cpu, mce_inject_cpumask);
        if (m->inject_flags & MCJ_EXCEPTION)
-               raise_exception(m, args->regs);
+               raise_exception(m, regs);
        else if (m->status)
                raise_poll(m);
-       return NOTIFY_STOP;
+       return NMI_HANDLED;
 }
 
-static struct notifier_block mce_raise_nb = {
-       .notifier_call = mce_raise_notify,
-       .priority = NMI_LOCAL_NORMAL_PRIOR,
-};
-
 /* Inject mce on current CPU */
 static int raise_local(void)
 {
@@ -216,7 +209,8 @@ static int inject_init(void)
                return -ENOMEM;
        printk(KERN_INFO "Machine check injector initialized\n");
        mce_chrdev_ops.write = mce_write;
-       register_die_notifier(&mce_raise_nb);
+       register_nmi_handler(NMI_LOCAL, mce_raise_notify, 0,
+                               "mce_notify");
        return 0;
 }