summaryrefslogtreecommitdiffstats
path: root/include
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 /include
parentf4091322d7397c8eb85c071570cab0e82ee3e261 (diff)
downloadlinux-stable-6b94631f9e8c45a46056cbc6a7a50ecebea4f8da.tar.gz
linux-stable-6b94631f9e8c45a46056cbc6a7a50ecebea4f8da.tar.bz2
linux-stable-6b94631f9e8c45a46056cbc6a7a50ecebea4f8da.zip
consolidate sys_execve() prototype
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/syscalls.h7
-rw-r--r--include/linux/syscalls.h3
2 files changed, 3 insertions, 7 deletions
diff --git a/include/asm-generic/syscalls.h b/include/asm-generic/syscalls.h
index 7e4fdb649951..77960333b1a1 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 727f0cd73921..2779009ceaa3 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,