commit d03d26e58fde2ec99478e26aab47b55755189b08
author Al Viro <viro@zeniv.linux.org.uk> Sat Oct 20 21:46:25 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Wed Nov 28 21:53:37 2012 -0500
tree 025a102a36e62b21a139bcc5ca7abf2c250cd209
parent 910cdc553a324d3df56b73c84cdef20836817d52

make compat_do_execve() static, lose pt_regs argument

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/exec.c

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 @@
 }
 
 #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 @@
 		.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 @@
 	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;

include/linux/compat.h

diff --git a/include/linux/compat.h b/include/linux/compat.h
index d2db710..784ebfe 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -284,8 +284,6 @@
 		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);