summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-10-20 21:46:25 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-11-28 21:53:37 -0500
commitd03d26e58fde2ec99478e26aab47b55755189b08 (patch)
tree025a102a36e62b21a139bcc5ca7abf2c250cd209 /fs
parent910cdc553a324d3df56b73c84cdef20836817d52 (diff)
downloadop-kernel-dev-d03d26e58fde2ec99478e26aab47b55755189b08.zip
op-kernel-dev-d03d26e58fde2ec99478e26aab47b55755189b08.tar.gz
make compat_do_execve() static, lose pt_regs argument
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/exec.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 0039055..f86b6cc 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1575,10 +1575,9 @@ int do_execve(const char *filename,
}
#ifdef CONFIG_COMPAT
-int compat_do_execve(const char *filename,
+static int compat_do_execve(const char *filename,
const compat_uptr_t __user *__argv,
- const compat_uptr_t __user *__envp,
- struct pt_regs *regs)
+ const compat_uptr_t __user *__envp)
{
struct user_arg_ptr argv = {
.is_compat = true,
@@ -1588,7 +1587,7 @@ int compat_do_execve(const char *filename,
.is_compat = true,
.ptr.compat = __envp,
};
- return do_execve_common(filename, argv, envp, regs);
+ return do_execve_common(filename, argv, envp, current_pt_regs());
}
#endif
@@ -1682,8 +1681,7 @@ asmlinkage long compat_sys_execve(const char __user * filename,
struct filename *path = getname(filename);
int error = PTR_ERR(path);
if (!IS_ERR(path)) {
- error = compat_do_execve(path->name, argv, envp,
- current_pt_regs());
+ error = compat_do_execve(path->name, argv, envp);
putname(path);
}
return error;
OpenPOWER on IntegriCloud