diff options
| author | Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> | 2010-12-09 09:02:06 +0100 |
|---|---|---|
| committer | Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> | 2011-01-13 20:41:06 +0100 |
| commit | 992a88b62ca327f10d82dbad71a8c061d4229888 (patch) | |
| tree | 6056226e8480f5ed766d7364fb1c6762c7b5eaca | |
| parent | 664cb7142ced8b827e92e1851d1ed2cae922f225 (diff) | |
| download | blackbird-op-linux-992a88b62ca327f10d82dbad71a8c061d4229888.tar.gz blackbird-op-linux-992a88b62ca327f10d82dbad71a8c061d4229888.zip | |
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>
| -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 @@ #include <linux/types.h> #include <linux/signal.h> -/* kernel/process.c */ -asmlinkage int sys_clone(unsigned long, unsigned long, - unsigned long, unsigned long, - struct pt_regs *); - /* mm/cache.c */ asmlinkage int sys_cacheflush(int, void __user *, size_t); 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) } asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, - unsigned long parent_tidptr, - unsigned long child_tidptr, struct pt_regs *regs) + void __user *parent_tidptr, void __user *child_tidptr, + struct pt_regs *regs) { if (!newsp) newsp = regs->sp; - return do_fork(clone_flags, newsp, regs, 0, - (int __user *)parent_tidptr, - (int __user *)child_tidptr); + return do_fork(clone_flags, newsp, regs, 0, parent_tidptr, + child_tidptr); } asmlinkage int sys_vfork(struct pt_regs *regs) |
