aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/process_64.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-24 09:56:20 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-24 09:56:20 +0200
commitebdd90a8cb2e3963f55499850f02ce6003558b55 (patch)
treed153f917ed41d257ddafa22f9cc2201bfddf8f9c /arch/x86/kernel/process_64.c
parentx86: fix ds.c build error (diff)
parentLinux 2.6.27-rc7 (diff)
downloadlinux-dev-ebdd90a8cb2e3963f55499850f02ce6003558b55.tar.xz
linux-dev-ebdd90a8cb2e3963f55499850f02ce6003558b55.zip
Merge commit 'v2.6.27-rc7' into x86/pebs
Diffstat (limited to 'arch/x86/kernel/process_64.c')
-rw-r--r--arch/x86/kernel/process_64.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 91ffce47af8e..30ce4734edaa 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -93,14 +93,13 @@ DECLARE_PER_CPU(int, cpu_state);
static inline void play_dead(void)
{
idle_task_exit();
- wbinvd();
mb();
/* Ack it */
__get_cpu_var(cpu_state) = CPU_DEAD;
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)