diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /arch/parisc/kernel/process.c | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'arch/parisc/kernel/process.c')
| -rw-r--r-- | arch/parisc/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index b80e02a4d81d..8aa591ed9127 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c | |||
| @@ -263,7 +263,7 @@ sys_vfork(struct pt_regs *regs) | |||
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | int | 265 | int |
| 266 | copy_thread(int nr, unsigned long clone_flags, unsigned long usp, | 266 | copy_thread(unsigned long clone_flags, unsigned long usp, |
| 267 | unsigned long unused, /* in ia64 this is "user_stack_size" */ | 267 | unsigned long unused, /* in ia64 this is "user_stack_size" */ |
| 268 | struct task_struct * p, struct pt_regs * pregs) | 268 | struct task_struct * p, struct pt_regs * pregs) |
| 269 | { | 269 | { |