summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2010-10-07 14:08:52 +0100
committerDavid Howells <dhowells@redhat.com>2010-10-07 14:08:52 +0100
commitd8b5fc01683c66060edc202d6bb5635365822181 (patch)
treea50df691d4a2087822aaccfb9790c999b419da4b /arch
parent3b139cdb373282dfa72316aa56887371e97cafe8 (diff)
downloadop-kernel-dev-d8b5fc01683c66060edc202d6bb5635365822181.zip
op-kernel-dev-d8b5fc01683c66060edc202d6bb5635365822181.tar.gz
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/include/asm/syscalls_32.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h
index be201fd..ae717e3 100644
--- a/arch/sh/include/asm/syscalls_32.h
+++ b/arch/sh/include/asm/syscalls_32.h
@@ -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);
OpenPOWER on IntegriCloud