[PATCH] drop "[PATCH] i386 kexec-on-panic: Don't shutdown the apics"

A patch by Eric was merged (f2b36db692b7ff6972320ad9839ae656a3b0ee3e)
and later on reverted back (1e4c85f97fe26fbd70da12148b3992c0e00361fd).

Along with above patch, another patch was posted and has been merged
(3d1675b41b02d64bd1185903ea0d25a8c0bb6dea).  That patch was dependent on
the above patch and now it should also be reverted.

Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c
index af809ccf5fbe14d526dfca29be0a3a160c6eacd4..0248e084017ceddd74bcc7e92052cef801b897ff 100644 (file)
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
@@ -21,6 +21,7 @@
 #include <asm/hardirq.h>
 #include <asm/nmi.h>
 #include <asm/hw_irq.h>
+#include <asm/apic.h>
 #include <mach_ipi.h>
 
 
@@ -147,6 +148,7 @@ static int crash_nmi_callback(struct pt_regs *regs, int cpu)
                regs = &fixed_regs;
        }
        crash_save_this_cpu(regs, cpu);
+       disable_local_APIC();
        atomic_dec(&waiting_for_crash_ipi);
        /* Assume hlt works */
        halt();
@@ -186,6 +188,7 @@ static void nmi_shootdown_cpus(void)
        }
 
        /* Leave the nmi callback set */
+       disable_local_APIC();
 }
 #else
 static void nmi_shootdown_cpus(void)
@@ -210,5 +213,9 @@ void machine_crash_shutdown(struct pt_regs *regs)
        /* Make a note of crashing cpu. Will be used in NMI callback.*/
        crashing_cpu = smp_processor_id();
        nmi_shootdown_cpus();
+       lapic_shutdown();
+#if defined(CONFIG_X86_IO_APIC)
+       disable_IO_APIC();
+#endif
        crash_save_self(regs);
 }