X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;ds=sidebyside;f=arch%2Fx86%2Fkernel%2Fcrash.c;h=e0e0841eef45dcf4381e28a9618a9c1db203df05;hb=bef4a0ab984662d4ccd68d431a7c4ef3daebcb43;hp=74467feb4dc55b2d4e8495992925efe5a51d77f7;hpb=8665ffc9215be1fe56f97500dad0440c9b644f5c;p=karo-tx-linux.git

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 74467feb4dc5..e0e0841eef45 100644
--- 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