[lkml]   [2010]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH 11/22] 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 <>

    arch/sh/include/asm/syscalls_32.h | 6 ++++--
    1 files changed, 4 insertions(+), 2 deletions(-)

    diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h
    index be201fd..454538a 100644
    --- a/arch/sh/include/asm/syscalls_32.h
    +++ b/arch/sh/include/asm/syscalls_32.h
    @@ -19,8 +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,
    +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,

     \ /
      Last update: 2010-08-27 04:05    [W:0.020 / U:161.688 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site