summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-24 16:39:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-24 16:39:50 -0700
commitc0f4d6d4b14a75a341d972ff73fb9740e1ceb634 (patch)
tree99addc159172d29417d697e8f832721e2d4355e2
parent1126388609dee3f2aca2a64de7b0709d0fede785 (diff)
parent1eda81495a49a4ee91d8863b0a441a624375efea (diff)
downloadlinux-c0f4d6d4b14a75a341d972ff73fb9740e1ceb634.tar.bz2
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: prevent stale state of c1e_mask across CPU offline/online, fix
-rw-r--r--arch/x86/kernel/process_32.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 4b3cfdf54216..31f40b24bf5d 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -55,6 +55,7 @@
#include <asm/tlbflush.h>
#include <asm/cpu.h>
#include <asm/kdebug.h>
+#include <asm/idle.h>
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");