diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
| commit | 5e34437840d33554f69380584311743b39e8fbeb (patch) | |
| tree | e081135619ee146af5efb9ee883afca950df5757 /arch/um/kernel/process.c | |
| parent | 77d05632baee21b1cef8730d7c06aa69601e4dca (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/sysctl.c
Diffstat (limited to 'arch/um/kernel/process.c')
| -rw-r--r-- | arch/um/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index a1c6d07cac3e..4a28a1568d85 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c | |||
| @@ -179,7 +179,7 @@ void fork_handler(void) | |||
| 179 | userspace(¤t->thread.regs.regs); | 179 | userspace(¤t->thread.regs.regs); |
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, | 182 | int copy_thread(unsigned long clone_flags, unsigned long sp, |
| 183 | unsigned long stack_top, struct task_struct * p, | 183 | unsigned long stack_top, struct task_struct * p, |
| 184 | struct pt_regs *regs) | 184 | struct pt_regs *regs) |
| 185 | { | 185 | { |