summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-18 13:27:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-18 13:27:41 -0700
commit2a554736f0d518b7c4d9939c6a6842bffebc7475 (patch)
tree466ffd550f978b1e066bb9935af456f4db463275
parentd15ca3203754359cfe5d18910722d3089b204cc4 (diff)
parent145e5aa269d54e4ea53fdb5e597007bd287fbe49 (diff)
downloadlinux-3.10-2a554736f0d518b7c4d9939c6a6842bffebc7475.tar.gz
linux-3.10-2a554736f0d518b7c4d9939c6a6842bffebc7475.tar.bz2
linux-3.10-2a554736f0d518b7c4d9939c6a6842bffebc7475.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix build error: conflicting types for ‘sys_execve’
-rw-r--r--arch/ia64/include/asm/unistd.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index 87f1bd1efc8..954d398a54b 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,