From 522d3db64b55ae6b910e0aa12fe4b77d394e62ef Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Thu, 7 Oct 2010 14:08:52 +0100
Subject: [PATCH] --- yaml --- r: 212351 b: refs/heads/master c:
 d8b5fc01683c66060edc202d6bb5635365822181 h: refs/heads/master i:   212349:
 e89bb9761c4fe99f9a8b1b866f352eb63ab8ac50   212347:
 450714ea250717c187254320336e67fd6ecb0b45   212343:
 991ab271eefda40fe01aa11c917454654dfce607   212335:
 6ab7edca0f4eb76511f6842022c07c40f9fa8b98   212319:
 80266c60e18c7899e445c4eaa4b04f08be95b598   212287:
 242f45cfaf934b9404a0f8a177557d06d9d40a32   212223:
 c6deadd8afdc6059517e2b09f13e18c2a4291215 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/sh/include/asm/syscalls_32.h | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5e39c7095d8f..76913cb78d64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b139cdb373282dfa72316aa56887371e97cafe8
+refs/heads/master: d8b5fc01683c66060edc202d6bb5635365822181
diff --git a/trunk/arch/sh/include/asm/syscalls_32.h b/trunk/arch/sh/include/asm/syscalls_32.h
index be201fdc97aa..ae717e3c26d6 100644
--- a/trunk/arch/sh/include/asm/syscalls_32.h
+++ b/trunk/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);