Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / arch / x86 / kernel / crash.c

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 10e74d4778a1c48925e8d9a72f185d925c9eae3a..1f6680427ff0ecd7813b9b9b356800acb1af1bc9 100644 (file)
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -199,9 +199,10 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
 #ifdef CONFIG_X86_IO_APIC
        /* Prevent crash_kexec() from deadlocking on ioapic_lock. */
        ioapic_zap_locks();
-       disable_IO_APIC();
+       clear_IO_APIC();
 #endif
        lapic_shutdown();
+       restore_boot_irq_mode();
 #ifdef CONFIG_HPET_TIMER
        hpet_disable();
 #endif