Skip to content

Commit

Permalink
get rid of pt_regs argument of do_execve_common()
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Nov 29, 2012
1 parent da3d4c5 commit 835ab32
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fs/exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1439,15 +1439,15 @@ EXPORT_SYMBOL(search_binary_handler);
*/
static int do_execve_common(const char *filename,
struct user_arg_ptr argv,
struct user_arg_ptr envp,
struct pt_regs *regs)
struct user_arg_ptr envp)
{
struct linux_binprm *bprm;
struct file *file;
struct files_struct *displaced;
bool clear_in_exec;
int retval;
const struct cred *cred = current_cred();
struct pt_regs *regs = current_pt_regs();

/*
* We move the actual failure in case of RLIMIT_NPROC excess from
Expand Down Expand Up @@ -1570,7 +1570,7 @@ int do_execve(const char *filename,
{
struct user_arg_ptr argv = { .ptr.native = __argv };
struct user_arg_ptr envp = { .ptr.native = __envp };
return do_execve_common(filename, argv, envp, current_pt_regs());
return do_execve_common(filename, argv, envp);
}

#ifdef CONFIG_COMPAT
Expand All @@ -1586,7 +1586,7 @@ static int compat_do_execve(const char *filename,
.is_compat = true,
.ptr.compat = __envp,
};
return do_execve_common(filename, argv, envp, current_pt_regs());
return do_execve_common(filename, argv, envp);
}
#endif

Expand Down

0 comments on commit 835ab32

Please sign in to comment.