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

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

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 497e9b7077c14a4e36056bbffd75965fed9f3df2..69881b2d446ce29de1c61640d2e90e0e02ad5e7c 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1591,7 +1591,12 @@ int native_cpu_disable(void)
        if (ret)
                return ret;
 
-       clear_local_APIC();
+       /*
+        * Disable the local APIC. Otherwise IPI broadcasts will reach
+        * it. It still responds normally to INIT, NMI, SMI, and SIPI
+        * messages.
+        */
+       apic_soft_disable();
        cpu_disable_common();
 
        return 0;