git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.27-rc7' into x86/pebs
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
process_64.c
diff --git
a/arch/x86/kernel/process_64.c
b/arch/x86/kernel/process_64.c
index
91ffce4
..
30ce473
100644
(file)
--- 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();
static inline void play_dead(void)
{
idle_task_exit();
- wbinvd();
mb();
/* Ack it */
__get_cpu_var(cpu_state) = CPU_DEAD;
local_irq_disable();
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)
}
#else
static inline void play_dead(void)