diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 10:18:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 12:06:53 -0400 |
| commit | 0962f402af1bb0b53ccee626785d202a10c12fff (patch) | |
| tree | 26fa57193f16e45c6e0557049d02164f129077ed /arch/x86/kernel/process_64.c | |
| parent | 19268ed7449c561694d048a34601a30e2d1aaf79 (diff) | |
| parent | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff) | |
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_64.c')
| -rw-r--r-- | arch/x86/kernel/process_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 4e168b250aff..79e3e173ab40 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #include <asm/proto.h> | 51 | #include <asm/proto.h> |
| 52 | #include <asm/ia32.h> | 52 | #include <asm/ia32.h> |
| 53 | #include <asm/idle.h> | 53 | #include <asm/idle.h> |
| 54 | #include <asm/syscalls.h> | ||
| 54 | 55 | ||
| 55 | asmlinkage extern void ret_from_fork(void); | 56 | asmlinkage extern void ret_from_fork(void); |
| 56 | 57 | ||