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

Pull x86/apic fix from Ingo Molnar:
 "A single fix to the IO-APIC / local-APIC shutdown sequence"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Disable I/O APIC before shutdown of the local APIC

2 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index e0e0841eef45..18677a90d6a3 100644
--- 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
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 7e920bff99a3..618ce264b237 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -550,6 +550,10 @@ static void native_machine_emergency_restart(void)
 void native_machine_shutdown(void)
 {
         /* Stop the cpus and apics */
+#ifdef CONFIG_X86_IO_APIC
+        disable_IO_APIC();
+#endif
+
 #ifdef CONFIG_SMP
         /*
          * Stop all of the others. Also disable the local irq to
@@ -562,10 +566,6 @@ void native_machine_shutdown(void)
 
         lapic_shutdown();
 
-#ifdef CONFIG_X86_IO_APIC
-        disable_IO_APIC();
-#endif
-
 #ifdef CONFIG_HPET_TIMER
         hpet_disable();
 #endif