2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: David Howells <[email protected]> commit d8b5fc01683c66060edc202d6bb5635365822181 upstream. Add missing consts to the sys_execve() declaration which result in the following error: arch/sh/kernel/process_32.c:303: error: conflicting types for 'sys_execve' /warthog/nfs/linux-2.6-fscache/arch/sh/include/asm/syscalls_32.h:24: error: previous declaration of 'sys_execve' was here Signed-off-by: David Howells <[email protected]> Cc: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- arch/sh/include/asm/syscalls_32.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux/arch/sh/include/asm/syscalls_32.h =================================================================== --- linux.orig/arch/sh/include/asm/syscalls_32.h +++ linux/arch/sh/include/asm/syscalls_32.h @@ -19,8 +19,8 @@ asmlinkage int sys_clone(unsigned long c asmlinkage int sys_vfork(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7, struct pt_regs __regs); -asmlinkage int sys_execve(char __user *ufilename, char __user * __user *uargv, - char __user * __user *uenvp, unsigned long r7, +asmlinkage int sys_execve(char __user *ufilename, const char __user * __user *uargv, + const char __user * __user *uenvp, unsigned long r7, struct pt_regs __regs); asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5, unsigned long r6, unsigned long r7, _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
