From: Paul Mundt Date: Fri, 20 Aug 2010 11:52:23 +0000 (+0900) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b9afa3e015273a52718e0a7efe198a0df76be880;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 Conflicts: arch/sh/kernel/process_32.c Signed-off-by: Paul Mundt --- b9afa3e015273a52718e0a7efe198a0df76be880 diff --cc arch/sh/include/asm/syscalls_32.h index be201fdc97aa,be201fdc97aa..ae717e3c26d6 --- a/arch/sh/include/asm/syscalls_32.h +++ b/arch/sh/include/asm/syscalls_32.h @@@ -19,9 -19,9 +19,10 @@@ asmlinkage int sys_clone(unsigned long asmlinkage int sys_vfork(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7, struct pt_regs __regs); --asmlinkage int sys_execve(const char __user *ufilename, char __user * __user *uargv, -- char __user * __user *uenvp, unsigned long r7, -- struct pt_regs __regs); ++asmlinkage int sys_execve(const char __user *ufilename, ++ const char __user *const __user *uargv, ++ const char __user *const __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, struct pt_regs __regs);