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 branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
process_32.c
diff --git
a/arch/x86/kernel/process_32.c
b/arch/x86/kernel/process_32.c
index
2196c70
..
795b79f
100644
(file)
--- a/
arch/x86/kernel/process_32.c
+++ b/
arch/x86/kernel/process_32.c
@@
-57,6
+57,7
@@
#include <asm/idle.h>
#include <asm/syscalls.h>
#include <asm/debugreg.h>
#include <asm/idle.h>
#include <asm/syscalls.h>
#include <asm/debugreg.h>
+#include <asm/nmi.h>
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
@@
-107,6
+108,7
@@
void cpu_idle(void)
if (cpu_is_offline(cpu))
play_dead();
if (cpu_is_offline(cpu))
play_dead();
+ local_touch_nmi();
local_irq_disable();
/* Don't trace irqs off for idle */
stop_critical_timings();
local_irq_disable();
/* Don't trace irqs off for idle */
stop_critical_timings();