diff options
Diffstat (limited to 'arch/x86/kernel/process_64.c')
-rw-r--r-- | arch/x86/kernel/process_64.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index f693e44e1bf6..3bd7e6eebf31 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
@@ -51,6 +51,7 @@ | |||
51 | #include <asm/idle.h> | 51 | #include <asm/idle.h> |
52 | #include <asm/syscalls.h> | 52 | #include <asm/syscalls.h> |
53 | #include <asm/debugreg.h> | 53 | #include <asm/debugreg.h> |
54 | #include <asm/nmi.h> | ||
54 | 55 | ||
55 | asmlinkage extern void ret_from_fork(void); | 56 | asmlinkage extern void ret_from_fork(void); |
56 | 57 | ||
@@ -133,6 +134,7 @@ void cpu_idle(void) | |||
133 | * from here on, until they go to idle. | 134 | * from here on, until they go to idle. |
134 | * Otherwise, idle callbacks can misfire. | 135 | * Otherwise, idle callbacks can misfire. |
135 | */ | 136 | */ |
137 | local_touch_nmi(); | ||
136 | local_irq_disable(); | 138 | local_irq_disable(); |
137 | enter_idle(); | 139 | enter_idle(); |
138 | /* Don't trace irqs off for idle */ | 140 | /* Don't trace irqs off for idle */ |