[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20101212234549.AA6CFB27BF@basil.firstfloor.org>
Date: Mon, 13 Dec 2010 00:45:49 +0100 (CET)
From: Andi Kleen <andi@...stfloor.org>
To: dhowells@...hat.com, iwamatsu@...auri.org, gregkh@...e.de,
ak@...ux.intel.com, linux-kernel@...r.kernel.org, stable@...nel.org
Subject: [PATCH] [52/223] SH: Add missing consts to sys_execve() declaration
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <dhowells@...hat.com>
commit d8b5fc01683c66060edc202d6bb5635365822181 upstream.
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@...hat.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@...auri.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
Signed-off-by: Andi Kleen <ak@...ux.intel.com>
---
arch/sh/include/asm/syscalls_32.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: linux/arch/sh/include/asm/syscalls_32.h
===================================================================
--- linux.orig/arch/sh/include/asm/syscalls_32.h
+++ linux/arch/sh/include/asm/syscalls_32.h
@@ -19,8 +19,8 @@ asmlinkage int sys_clone(unsigned long c
asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7,
struct pt_regs __regs);
-asmlinkage int sys_execve(char __user *ufilename, char __user * __user *uargv,
- char __user * __user *uenvp, unsigned long r7,
+asmlinkage int sys_execve(char __user *ufilename, const char __user * __user *uargv,
+ const char __user * __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,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists