Merge commit 'v2.6.27-rc7' into x86/pebs

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 68f4ae2ac99a..ae584f87d06a 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -95,7 +95,6 @@ static inline void play_dead(void)
 {
         /* This must be done before dead CPU ack */
         cpu_exit_clear();
-        wbinvd();
         mb();
         /* Ack it */
         __get_cpu_var(cpu_state) = CPU_DEAD;
@@ -104,8 +103,8 @@ static inline void play_dead(void)
          * With physical CPU hotplug, we should halt the cpu
          */
         local_irq_disable();
-        while (1)
-                halt();
+        /* mask all interrupts, flush any and all caches, and halt */
+        wbinvd_halt();
 }
 #else
 static inline void play_dead(void)