Merge tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux

[karo-tx-linux.git] / arch / x86 / kernel / crash.c

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 74467feb4dc55b2d4e8495992925efe5a51d77f7..e0e0841eef45dcf4381e28a9618a9c1db203df05 100644 (file)
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -128,7 +128,9 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
        cpu_emergency_svm_disable();
 
        lapic_shutdown();
-#if defined(CONFIG_X86_IO_APIC)
+#ifdef CONFIG_X86_IO_APIC
+       /* Prevent crash_kexec() from deadlocking on ioapic_lock. */
+       ioapic_zap_locks();
        disable_IO_APIC();
 #endif
 #ifdef CONFIG_HPET_TIMER