summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-10-20 13:32:30 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-11-28 21:53:35 -0500
commit6b94631f9e8c45a46056cbc6a7a50ecebea4f8da (patch)
tree0a382a7968c6922a343ca88f5ea36743b18eef44
parentf4091322d7397c8eb85c071570cab0e82ee3e261 (diff)
downloadop-kernel-dev-6b94631f9e8c45a46056cbc6a7a50ecebea4f8da.zip
op-kernel-dev-6b94631f9e8c45a46056cbc6a7a50ecebea4f8da.tar.gz
consolidate sys_execve() prototype
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--arch/hexagon/include/asm/syscall.h3
-rw-r--r--arch/tile/include/asm/syscalls.h4
-rw-r--r--arch/x86/include/asm/syscalls.h3
-rw-r--r--arch/xtensa/include/asm/syscall.h1
-rw-r--r--include/asm-generic/syscalls.h7
-rw-r--r--include/linux/syscalls.h3
6 files changed, 3 insertions, 18 deletions
diff --git a/arch/hexagon/include/asm/syscall.h b/arch/hexagon/include/asm/syscall.h
index fb0e9d4..ec2ce67 100644
--- a/arch/hexagon/include/asm/syscall.h
+++ b/arch/hexagon/include/asm/syscall.h
@@ -25,12 +25,9 @@ typedef long (*syscall_fn)(unsigned long, unsigned long,
unsigned long, unsigned long,
unsigned long, unsigned long);
-asmlinkage int sys_execve(char __user *ufilename, char __user * __user *argv,
- char __user * __user *envp);
asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
unsigned long parent_tidp, unsigned long child_tidp);
-#define sys_execve sys_execve
#define sys_clone sys_clone
#include <asm-generic/syscalls.h>
diff --git a/arch/tile/include/asm/syscalls.h b/arch/tile/include/asm/syscalls.h
index 369696d..394c76f 100644
--- a/arch/tile/include/asm/syscalls.h
+++ b/arch/tile/include/asm/syscalls.h
@@ -65,13 +65,9 @@ long sys_ftruncate64(unsigned int fd, loff_t length);
/* Provide versions of standard syscalls that use current_pt_regs(). */
long sys_clone(unsigned long clone_flags, unsigned long newsp,
void __user *parent_tid, void __user *child_tid);
-long sys_execve(const char __user *filename,
- const char __user *const __user *argv,
- const char __user *const __user *envp);
long sys_rt_sigreturn(void);
long sys_sigaltstack(const stack_t __user *, stack_t __user *);
#define sys_clone sys_clone
-#define sys_execve sys_execve
#define sys_rt_sigreturn sys_rt_sigreturn
#define sys_sigaltstack sys_sigaltstack
diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h
index 2be0b88..9e5aef3 100644
--- a/arch/x86/include/asm/syscalls.h
+++ b/arch/x86/include/asm/syscalls.h
@@ -23,9 +23,6 @@ long sys_iopl(unsigned int, struct pt_regs *);
/* kernel/process.c */
int sys_fork(struct pt_regs *);
int sys_vfork(struct pt_regs *);
-long sys_execve(const char __user *,
- const char __user *const __user *,
- const char __user *const __user *);
long sys_clone(unsigned long, unsigned long, void __user *,
void __user *, struct pt_regs *);
diff --git a/arch/xtensa/include/asm/syscall.h b/arch/xtensa/include/asm/syscall.h
index 124aeee..4e27d76 100644
--- a/arch/xtensa/include/asm/syscall.h
+++ b/arch/xtensa/include/asm/syscall.h
@@ -10,7 +10,6 @@
struct pt_regs;
struct sigaction;
-asmlinkage long sys_execve(char*, char**, char**, struct pt_regs*);
asmlinkage long xtensa_clone(unsigned long, unsigned long, struct pt_regs*);
asmlinkage long xtensa_ptrace(long, long, long, long);
asmlinkage long xtensa_sigreturn(struct pt_regs*);
diff --git a/include/asm-generic/syscalls.h b/include/asm-generic/syscalls.h
index 7e4fdb6..7796033 100644
--- a/include/asm-generic/syscalls.h
+++ b/include/asm-generic/syscalls.h
@@ -21,13 +21,6 @@ asmlinkage long sys_fork(void);
asmlinkage long sys_vfork(void);
#endif
-#ifndef sys_execve
-asmlinkage long sys_execve(const char __user *filename,
- const char __user *const __user *argv,
- const char __user *const __user *envp,
- struct pt_regs *regs);
-#endif
-
#ifndef sys_mmap2
asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
unsigned long prot, unsigned long flags,
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 727f0cd7..2779009 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -837,6 +837,9 @@ int kernel_execve(const char *filename, const char *const argv[], const char *co
current_pt_regs())
#endif
+asmlinkage long sys_execve(const char __user *filename,
+ const char __user *const __user *argv,
+ const char __user *const __user *envp);
asmlinkage long sys_perf_event_open(
struct perf_event_attr __user *attr_uptr,
OpenPOWER on IntegriCloud