2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ Date: Thu, 14 Apr 2011 16:11:35 +0100 Subject: 2.6.35.y: Revert "SH: Add missing consts to sys_execve() declaration" This reverts commit 1219932ca26da2026e598590a3b7a2f36b3c3621 (commit d8b5fc01683c66060edc202d6bb5635365822181 upstream). The reverted commit depends on an upstream commit that has not been applied to 2.6.35.y (d7627467b7a8dd6944885290a03a07ceb28c10eb). This fixes a build failure on all SH devices: /arch/sh/kernel/process_32.c:299: error: conflicting types for 'sys_execve' /arch/sh/include/asm/syscalls_32.h:22: note: previous declaration of 'sys_execve' was here Signed-off-by: Phil Edworthy <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- arch/sh/include/asm/syscalls_32.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.35.y/arch/sh/include/asm/syscalls_32.h =================================================================== --- linux-2.6.35.y.orig/arch/sh/include/asm/syscalls_32.h +++ linux-2.6.35.y/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, const char __user * __user *uargv, - const char __user * __user *uenvp, unsigned long r7, +asmlinkage int sys_execve(char __user *ufilename, char __user * __user *uargv, + 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
