Revert "ipmi: add new IPMI nmi watchdog handling"

This reverts commit f64da958dfc83335de1d2bef9d3868f30feb4e53.

Andi Kleen is unhappy with the changes, and they really do not seem
worth it.  IPMI could use DIE_NMI_IPI instead of the new callback, even
though that ends up having its own set of problems too, mainly because
the IPMI code cannot really know the NMI was from IPMI or not.

Manually fix up conflicts in arch/x86_64/kernel/traps.c and
drivers/char/ipmi/ipmi_watchdog.c.

Cc: Andi Kleen <ak@suse.de>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Corey Minyard <minyard@acm.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 0 insertions, 8 deletions

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index c05e7e861b29..90da0575fcff 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -733,11 +733,6 @@ static __kprobes void default_do_nmi(struct pt_regs * regs)
                  */
                 if (nmi_watchdog_tick(regs, reason))
                         return;
-#endif
-                if (notify_die(DIE_NMI_POST, "nmi_post", regs, reason, 2, 0)
-                                                        == NOTIFY_STOP)
-                        return;
-#ifdef CONFIG_X86_LOCAL_APIC
                 if (!do_nmi_callback(regs, smp_processor_id()))
 #endif
                         unknown_nmi_error(reason, regs);
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index d28f01379b9b..cb29fb96948d 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -776,9 +776,6 @@ asmlinkage __kprobes void default_do_nmi(struct pt_regs *regs)
                  */
                 if (nmi_watchdog_tick(regs,reason))
                         return;
-                if (notify_die(DIE_NMI_POST, "nmi_post", regs, reason, 2, 0)
-                                                                == NOTIFY_STOP)
-                        return;
                 if (!do_nmi_callback(regs,cpu))
                         unknown_nmi_error(reason, regs);