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

Previous thread: [PATCH] HID: magicmouse: Don't report REL_{X,Y} for Magic Trackpad by Chase Douglas on Wednesday, December 8, 2010 - 4:08 pm. (5 messages)

Next thread: [PATCH] platform/x86: Fix recursive Kconfig dependency by Peter Huewe on Wednesday, December 8, 2010 - 4:29 pm. (10 messages)
From: Peter Huewe
Date: Wednesday, December 8, 2010 - 4:19 pm

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@gmx.de>
---
This build failure exists in linus' tree - added stable@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

--

From: Hans-Christian Egtvedt
Date: Thursday, December 9, 2010 - 12:54 am

Actually, I think it would be just as good to move to using the
syscalls.h in asm-generic. Let me prepare a patch or two for that. I can
try to push it through my, now hopefully working, arch tree.

-- 
Hans-Christian Egtvedt

--

From: Peter =?iso-8859-1?q?H=FCwe?=
Date: Thursday, December 9, 2010 - 11:42 am

> This is _not_ how to get stuff into the stable kernel tree, sorry.
 It states: "You must note the upstream commit ID in the changelog of your 
Will do.
Or should I rather drop the patch and we wait on Hans-Christian's patch(es)?

Thanks,
Peter

--

Previous thread: [PATCH] HID: magicmouse: Don't report REL_{X,Y} for Magic Trackpad by Chase Douglas on Wednesday, December 8, 2010 - 4:08 pm. (5 messages)

Next thread: [PATCH] platform/x86: Fix recursive Kconfig dependency by Peter Huewe on Wednesday, December 8, 2010 - 4:29 pm. (10 messages)