From: Tony Luck <tony.luck@intel.com>
Date: Wed, 18 Aug 2010 17:17:44 +0000 (-0700)
Subject: [IA64] Fix build error: conflicting types for ‘sys_execve’
X-Git-Tag: firefly_0821_release~9833^2~715^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=145e5aa269d54e4ea53fdb5e597007bd287fbe49;p=firefly-linux-kernel-4.4.55.git

[IA64] Fix build error: conflicting types for ‘sys_execve’

arch/ia64/kernel/process.c:636: error: conflicting types for ‘sys_execve’

commit d7627467b7a8dd6944885290a03a07ceb28c10eb
Make do_execve() take a const filename pointer

Missed the declaration of sys_execve in the ia64 asm/unistd.h (perhaps
because there is no reason for it to be there ... it might be a left over
from the COMPAT code?). Just delete the conflicting version.

Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index 87f1bd1efc82..954d398a54b4 100644
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -356,8 +356,6 @@ asmlinkage unsigned long sys_mmap2(
 				int fd, long pgoff);
 struct pt_regs;
 struct sigaction;
-long sys_execve(const char __user *filename, char __user * __user *argv,
-			   char __user * __user *envp, struct pt_regs *regs);
 asmlinkage long sys_ia64_pipe(void);
 asmlinkage long sys_rt_sigaction(int sig,
 				 const struct sigaction __user *act,