x86/apic: Disable I/O APIC before shutdown of the local APIC

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / crash.c

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index e0e0841eef45dcf4381e28a9618a9c1db203df05..18677a90d6a35e1b5823d3f33501229197e21219 100644 (file)
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -127,12 +127,12 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
        cpu_emergency_vmxoff();
        cpu_emergency_svm_disable();
 
-       lapic_shutdown();
 #ifdef CONFIG_X86_IO_APIC
        /* Prevent crash_kexec() from deadlocking on ioapic_lock. */
        ioapic_zap_locks();
        disable_IO_APIC();
 #endif
+       lapic_shutdown();
 #ifdef CONFIG_HPET_TIMER
        hpet_disable();
 #endif