diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:54:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:54:49 -0400 |
| commit | d1a76187a5be4f89c6cb19d800cb5fb7aac735c5 (patch) | |
| tree | 2fac3ffbfffc7560eeef8364b541d0d7a0057920 /arch/um/kernel/syscall.c | |
| parent | c7e78cff6b7518212247fb20b1dc6411540dc9af (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into core/locking
Conflicts:
arch/um/include/asm/system.h
Diffstat (limited to 'arch/um/kernel/syscall.c')
| -rw-r--r-- | arch/um/kernel/syscall.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c index 128ee85bc8d9..c4df705b8359 100644 --- a/arch/um/kernel/syscall.c +++ b/arch/um/kernel/syscall.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include "asm/mman.h" | 12 | #include "asm/mman.h" |
| 13 | #include "asm/uaccess.h" | 13 | #include "asm/uaccess.h" |
| 14 | #include "asm/unistd.h" | 14 | #include "asm/unistd.h" |
| 15 | #include "internal.h" | ||
| 15 | 16 | ||
| 16 | long sys_fork(void) | 17 | long sys_fork(void) |
| 17 | { | 18 | { |