tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

SH: Add missing consts to sys_execve() declaration

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 <dhowells@redhat.com>

David Howells d8b5fc01 3b139cdb

+4 -3
+4 -3
arch/sh/include/asm/syscalls_32.h
··· 19 19 asmlinkage int sys_vfork(unsigned long r4, unsigned long r5, 20 20 unsigned long r6, unsigned long r7, 21 21 struct pt_regs __regs); 22 - asmlinkage int sys_execve(const char __user *ufilename, char __user * __user *uargv, 23 - char __user * __user *uenvp, unsigned long r7, 24 - struct pt_regs __regs); 22 + asmlinkage int sys_execve(const char __user *ufilename, 23 + const char __user *const __user *uargv, 24 + const char __user *const __user *uenvp, 25 + unsigned long r7, struct pt_regs __regs); 25 26 asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5, 26 27 unsigned long r6, unsigned long r7, 27 28 struct pt_regs __regs);