SH: Add missing consts to sys_execve() declaration
authorDavid Howells <dhowells@redhat.com>
Thu, 7 Oct 2010 13:08:52 +0000 (14:08 +0100)
committerDavid Howells <dhowells@redhat.com>
Thu, 7 Oct 2010 13:08:52 +0000 (14:08 +0100)
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>
arch/sh/include/asm/syscalls_32.h

index be201fdc97aa79bbf5470c8a582e20ecb7e78991..ae717e3c26d6d4178c1260c1602099d86534caed 100644 (file)
@@ -19,9 +19,10 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
 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);