[PATCH] avr32: Fix build failure conflicting types for 'sys_execve'

Peter Huewe peterhuewe at gmx.de
Wed Dec 8 23:19:33 UTC 2010


This patch fixes a build failure[1] for the avr32 architecture which seems
to be introduced by commit d7627467b7a8
"Make do_execve() take a const filename pointer"

The commit changes the definition in arch/avr32/kernel/process.c but
forgot to change it here.

Signed-off-by: Peter Huewe <peterhuewe at gmx.de>
---
This build failure exists in linus' tree - added stable at kernel.org to the cc list

KernelVersion: linux-next-20101208
References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/3607003/

 arch/avr32/include/asm/syscalls.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/avr32/include/asm/syscalls.h b/arch/avr32/include/asm/syscalls.h
index ab608b7..1440368 100644
--- a/arch/avr32/include/asm/syscalls.h
+++ b/arch/avr32/include/asm/syscalls.h
@@ -21,8 +21,10 @@ asmlinkage int sys_clone(unsigned long, unsigned long,
 			 unsigned long, unsigned long,
 			 struct pt_regs *);
 asmlinkage int sys_vfork(struct pt_regs *);
-asmlinkage int sys_execve(const char __user *, char __user *__user *,
-			  char __user *__user *, struct pt_regs *);
+asmlinkage int sys_execve(const char __user *ufilename,
+			  const char __user *const __user *uargv,
+			  const char __user *const __user *uenvp,
+			  struct pt_regs *regs);
 
 /* kernel/signal.c */
 asmlinkage int sys_sigaltstack(const stack_t __user *, stack_t __user *,
-- 
1.7.2.2




More information about the devel mailing list