diff options
| author | Tony Luck <tony.luck@intel.com> | 2010-08-18 10:17:44 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2010-08-18 10:17:44 -0700 |
| commit | 145e5aa269d54e4ea53fdb5e597007bd287fbe49 (patch) | |
| tree | f0939ba35a64546ce71a93e1f3f048f0306da509 /arch/ia64/include/asm | |
| parent | 3b89f56783a4ef796190ef1192c25e72e0b986b6 (diff) | |
| download | blackbird-op-linux-145e5aa269d54e4ea53fdb5e597007bd287fbe49.tar.gz blackbird-op-linux-145e5aa269d54e4ea53fdb5e597007bd287fbe49.zip | |
[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>
Diffstat (limited to 'arch/ia64/include/asm')
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 2 |
1 files changed, 0 insertions, 2 deletions
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, |
