Skip to content

Commit d8b5fc0

Browse files
committed
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 <[email protected]>
1 parent 3b139cd commit d8b5fc0

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

arch/sh/include/asm/syscalls_32.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
1919
asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
2020
unsigned long r6, unsigned long r7,
2121
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);
2526
asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5,
2627
unsigned long r6, unsigned long r7,
2728
struct pt_regs __regs);

0 commit comments

Comments
 (0)