From 0123efb651198638b51582039015443e68f52883 Mon Sep 17 00:00:00 2001 From: Hans-Christian Egtvedt Date: Thu, 9 Dec 2010 09:02:06 +0100 Subject: [PATCH] --- yaml --- r: 230635 b: refs/heads/master c: 992a88b62ca327f10d82dbad71a8c061d4229888 h: refs/heads/master i: 230633: a6378d58333328fe196fdba33a0ffaae5a21992c 230631: b45c7e092e2cf777e1e8fc9381f318d41b99fc57 v: v3 --- [refs] | 2 +- trunk/arch/avr32/include/asm/syscalls.h | 5 ----- trunk/arch/avr32/kernel/process.c | 9 ++++----- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 635b9527eef3..3fe0dba0a073 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 664cb7142ced8b827e92e1851d1ed2cae922f225 +refs/heads/master: 992a88b62ca327f10d82dbad71a8c061d4229888 diff --git a/trunk/arch/avr32/include/asm/syscalls.h b/trunk/arch/avr32/include/asm/syscalls.h index 730a461c606f..244f2acab546 100644 --- a/trunk/arch/avr32/include/asm/syscalls.h +++ b/trunk/arch/avr32/include/asm/syscalls.h @@ -15,11 +15,6 @@ #include #include -/* 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/trunk/arch/avr32/kernel/process.c b/trunk/arch/avr32/kernel/process.c index 9c46aaad11ce..ef5a2a08fcca 100644 --- a/trunk/arch/avr32/kernel/process.c +++ b/trunk/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)