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/avr32/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/avr32/kernel/process.c')
| -rw-r--r-- | arch/avr32/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c index 43ae555ecb33..1bbe1da54869 100644 --- a/arch/avr32/kernel/process.c +++ b/arch/avr32/kernel/process.c | |||
| @@ -332,7 +332,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu) | |||
| 332 | 332 | ||
| 333 | asmlinkage void ret_from_fork(void); | 333 | asmlinkage void ret_from_fork(void); |
| 334 | 334 | ||
| 335 | int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, | 335 | int copy_thread(unsigned long clone_flags, unsigned long usp, |
| 336 | unsigned long unused, | 336 | unsigned long unused, |
| 337 | struct task_struct *p, struct pt_regs *regs) | 337 | struct task_struct *p, struct pt_regs *regs) |
| 338 | { | 338 | { |