diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 16:18:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 18:06:53 +0200 |
| commit | 0962f402af1bb0b53ccee626785d202a10c12fff (patch) | |
| tree | 26fa57193f16e45c6e0557049d02164f129077ed /arch/x86/kernel/process_32.c | |
| parent | Merge branch 'x86/pebs' into x86-v28-for-linus-phase1 (diff) | |
| parent | Merge commit 'v2.6.27-rc3' into x86/prototypes (diff) | |
| download | linux-0962f402af1bb0b53ccee626785d202a10c12fff.tar.xz linux-0962f402af1bb0b53ccee626785d202a10c12fff.zip | |
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts:
arch/x86/kernel/process_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/process_32.c')
| -rw-r--r-- | arch/x86/kernel/process_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 491eb1a7e073..c8609dea443f 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -56,6 +56,8 @@ #include <asm/cpu.h> #include <asm/kdebug.h> #include <asm/idle.h> +#include <asm/syscalls.h> +#include <asm/smp.h> asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); |