diff options
author | Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> | 2010-12-09 03:02:06 -0500 |
---|---|---|
committer | Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> | 2011-01-13 14:41:06 -0500 |
commit | 992a88b62ca327f10d82dbad71a8c061d4229888 (patch) | |
tree | 6056226e8480f5ed766d7364fb1c6762c7b5eaca /arch | |
parent | 664cb7142ced8b827e92e1851d1ed2cae922f225 (diff) |
avr32: make architecture sys_clone prototype match asm-generic prototype
This patch will fix the arguments to the architecture sys_clone() function to
match the asm-generic/syscalls.h prototype. In the same go remove the
architecture specific prototype for the same function.
The sys_clone() function is only called from assembly, hence the argument types
were not having any affect.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/avr32/include/asm/syscalls.h | 5 | ||||
-rw-r--r-- | arch/avr32/kernel/process.c | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/arch/avr32/include/asm/syscalls.h b/arch/avr32/include/asm/syscalls.h index 730a461c606f..244f2acab546 100644 --- a/arch/avr32/include/asm/syscalls.h +++ b/arch/avr32/include/asm/syscalls.h | |||
@@ -15,11 +15,6 @@ | |||
15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
16 | #include <linux/signal.h> | 16 | #include <linux/signal.h> |
17 | 17 | ||
18 | /* kernel/process.c */ | ||
19 | asmlinkage int sys_clone(unsigned long, unsigned long, | ||
20 | unsigned long, unsigned long, | ||
21 | struct pt_regs *); | ||
22 | |||
23 | /* mm/cache.c */ | 18 | /* mm/cache.c */ |
24 | asmlinkage int sys_cacheflush(int, void __user *, size_t); | 19 | asmlinkage int sys_cacheflush(int, void __user *, size_t); |
25 | 20 | ||
diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c index 9c46aaad11ce..ef5a2a08fcca 100644 --- a/arch/avr32/kernel/process.c +++ b/arch/avr32/kernel/process.c | |||
@@ -367,14 +367,13 @@ asmlinkage int sys_fork(struct pt_regs *regs) | |||
367 | } | 367 | } |
368 | 368 | ||
369 | asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, | 369 | asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, |
370 | unsigned long parent_tidptr, | 370 | void __user *parent_tidptr, void __user *child_tidptr, |
371 | unsigned long child_tidptr, struct pt_regs *regs) | 371 | struct pt_regs *regs) |
372 | { | 372 | { |
373 | if (!newsp) | 373 | if (!newsp) |
374 | newsp = regs->sp; | 374 | newsp = regs->sp; |
375 | return do_fork(clone_flags, newsp, regs, 0, | 375 | return do_fork(clone_flags, newsp, regs, 0, parent_tidptr, |
376 | (int __user *)parent_tidptr, | 376 | child_tidptr); |
377 | (int __user *)child_tidptr); | ||
378 | } | 377 | } |
379 | 378 | ||
380 | asmlinkage int sys_vfork(struct pt_regs *regs) | 379 | asmlinkage int sys_vfork(struct pt_regs *regs) |