diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-20 21:50:59 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-28 21:53:37 -0500 |
| commit | 835ab32dff6b437e74c266468b83c4abb69041dc (patch) | |
| tree | e32ab73caa7235afc3635a7f2439a427e70cbbd2 /fs/exec.c | |
| parent | da3d4c5fa56236dd924d77ffc4f982356816b93b (diff) | |
| download | linux-stable-835ab32dff6b437e74c266468b83c4abb69041dc.tar.gz linux-stable-835ab32dff6b437e74c266468b83c4abb69041dc.tar.bz2 linux-stable-835ab32dff6b437e74c266468b83c4abb69041dc.zip | |
get rid of pt_regs argument of do_execve_common()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/exec.c b/fs/exec.c index 5797ed07efd3..dc5e2830d353 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1439,8 +1439,7 @@ 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; @@ -1448,6 +1447,7 @@ static int do_execve_common(const char *filename, 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 @@ -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 @@ -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 |