releases/2.6.36.2/sh-add-missing-consts-to-sys_execve-declaration.patch

   1 From d8b5fc01683c66060edc202d6bb5635365822181 Mon Sep 17 00:00:00 2001
   2 From: David Howells <dhowells@redhat.com>
   3 Date: Thu, 7 Oct 2010 14:08:52 +0100
   4 Subject: SH: Add missing consts to sys_execve() declaration
   5
   6 From: David Howells <dhowells@redhat.com>
   7
   8 commit d8b5fc01683c66060edc202d6bb5635365822181 upstream.
   9
  10 Add missing consts to the sys_execve() declaration which result in the
  11 following error:
  12
  13 arch/sh/kernel/process_32.c:303: error: conflicting types for 'sys_execve'
  14 /warthog/nfs/linux-2.6-fscache/arch/sh/include/asm/syscalls_32.h:24: error: previous declaration of 'sys_execve' was here
  15
  16 Signed-off-by: David Howells <dhowells@redhat.com>
  17 Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19
  20 ---
  21  arch/sh/include/asm/syscalls_32.h |    7 ++++---
  22  1 file changed, 4 insertions(+), 3 deletions(-)
  23
  24 --- a/arch/sh/include/asm/syscalls_32.h
  25 +++ b/arch/sh/include/asm/syscalls_32.h
  26 @@ -19,9 +19,10 @@ asmlinkage int sys_clone(unsigned long c
  27  asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
  28                          unsigned long r6, unsigned long r7,
  29                          struct pt_regs __regs);
  30 -asmlinkage int sys_execve(const char __user *ufilename, char __user * __user *uargv,
  31 -                         char __user * __user *uenvp, unsigned long r7,
  32 -                         struct pt_regs __regs);
  33 +asmlinkage int sys_execve(const char __user *ufilename,
  34 +                         const char __user *const __user *uargv,
  35 +                         const char __user *const __user *uenvp,
  36 +                         unsigned long r7, struct pt_regs __regs);
  37  asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5,
  38                               unsigned long r6, unsigned long r7,
  39                               struct pt_regs __regs);