diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-25 01:39:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-25 01:39:50 +0200 |
| commit | c0f4d6d4b14a75a341d972ff73fb9740e1ceb634 (patch) | |
| tree | 99addc159172d29417d697e8f832721e2d4355e2 /arch | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | x86: prevent stale state of c1e_mask across CPU offline/online, fix (diff) | |
| download | linux-c0f4d6d4b14a75a341d972ff73fb9740e1ceb634.tar.xz linux-c0f4d6d4b14a75a341d972ff73fb9740e1ceb634.zip | |
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.c | 1 |
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"); |