Commit d03d26e5 authored by Al Viro's avatar Al Viro

make compat_do_execve() static, lose pt_regs argument

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 910cdc55
......@@ -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;
......
......@@ -284,8 +284,6 @@ asmlinkage ssize_t compat_sys_pwritev(unsigned long fd,
const struct compat_iovec __user *vec,
unsigned long vlen, u32 pos_low, u32 pos_high);
int compat_do_execve(const char *filename, const compat_uptr_t __user *argv,
const compat_uptr_t __user *envp, struct pt_regs *regs);
asmlinkage long compat_sys_execve(const char __user *filename, const compat_uptr_t __user *argv,
const compat_uptr_t __user *envp);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment