aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-24 19:39:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-24 19:39:50 -0400
commitc0f4d6d4b14a75a341d972ff73fb9740e1ceb634 (patch)
tree99addc159172d29417d697e8f832721e2d4355e2 /arch
parent1126388609dee3f2aca2a64de7b0709d0fede785 (diff)
parent1eda81495a49a4ee91d8863b0a441a624375efea (diff)
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
Diffstat (limited to 'arch')
-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 @@
55#include <asm/tlbflush.h> 55#include <asm/tlbflush.h>
56#include <asm/cpu.h> 56#include <asm/cpu.h>
57#include <asm/kdebug.h> 57#include <asm/kdebug.h>
58#include <asm/idle.h>
58 59
59asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); 60asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
60 61