From 94d5d3be4907d2beb0759814522238787712cdff Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 19 Mar 2013 14:25:51 -0400
Subject: [PATCH] --- yaml --- r: 375287 b: refs/heads/master c:
 c5ddd2024a87353f73068732cfd38d3dfec22e87 h: refs/heads/master i:   375285:
 3c31711d66f1505bf5b87ad0f3b2702760c62e46   375283:
 6f1ee4df21288fd941f2992160969c380cfc8274   375279:
 af106246a394452a0bc2d11d3dd56b0a2788da04 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/s390/kernel/compat_wrapper.S | 4 ----
 trunk/arch/s390/kernel/syscalls.S       | 2 +-
 trunk/kernel/sysctl_binary.c            | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 013b866442a0..4aaaf08e0165 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dd9148bc5d813b543be9cb63949ddfa3bc4a990
+refs/heads/master: c5ddd2024a87353f73068732cfd38d3dfec22e87
diff --git a/trunk/arch/s390/kernel/compat_wrapper.S b/trunk/arch/s390/kernel/compat_wrapper.S
index 99696783fbf7..9cb1b975b353 100644
--- a/trunk/arch/s390/kernel/compat_wrapper.S
+++ b/trunk/arch/s390/kernel/compat_wrapper.S
@@ -793,10 +793,6 @@ ENTRY(sys32_stime_wrapper)
 	llgtr	%r2,%r2			# long *
 	jg	compat_sys_stime	# branch to system call
 
-ENTRY(sys32_sysctl_wrapper)
-	llgtr	%r2,%r2 		# struct compat_sysctl_args *
-	jg	compat_sys_sysctl
-
 ENTRY(sys32_fstat64_wrapper)
 	llgfr	%r2,%r2			# unsigned long
 	llgtr	%r3,%r3			# struct stat64 *
diff --git a/trunk/arch/s390/kernel/syscalls.S b/trunk/arch/s390/kernel/syscalls.S
index 9605e063dc8b..913410bd74a3 100644
--- a/trunk/arch/s390/kernel/syscalls.S
+++ b/trunk/arch/s390/kernel/syscalls.S
@@ -157,7 +157,7 @@ SYSCALL(sys_readv,sys_readv,compat_sys_readv_wrapper)		/* 145 */
 SYSCALL(sys_writev,sys_writev,compat_sys_writev_wrapper)
 SYSCALL(sys_getsid,sys_getsid,sys32_getsid_wrapper)
 SYSCALL(sys_fdatasync,sys_fdatasync,sys32_fdatasync_wrapper)
-SYSCALL(sys_sysctl,sys_sysctl,sys32_sysctl_wrapper)
+SYSCALL(sys_sysctl,sys_sysctl,compat_sys_sysctl)
 SYSCALL(sys_mlock,sys_mlock,sys32_mlock_wrapper)		/* 150 */
 SYSCALL(sys_munlock,sys_munlock,sys32_munlock_wrapper)
 SYSCALL(sys_mlockall,sys_mlockall,sys32_mlockall_wrapper)
diff --git a/trunk/kernel/sysctl_binary.c b/trunk/kernel/sysctl_binary.c
index ebf72358e86a..aea4a9ea6fc8 100644
--- a/trunk/kernel/sysctl_binary.c
+++ b/trunk/kernel/sysctl_binary.c
@@ -15,6 +15,7 @@
 #include <linux/netdevice.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/compat.h>
 
 #ifdef CONFIG_SYSCTL_SYSCALL
 
@@ -1447,7 +1448,6 @@ SYSCALL_DEFINE1(sysctl, struct __sysctl_args __user *, args)
 
 
 #ifdef CONFIG_COMPAT
-#include <asm/compat.h>
 
 struct compat_sysctl_args {
 	compat_uptr_t	name;
@@ -1459,7 +1459,7 @@ struct compat_sysctl_args {
 	compat_ulong_t	__unused[4];
 };
 
-asmlinkage long compat_sys_sysctl(struct compat_sysctl_args __user *args)
+COMPAT_SYSCALL_DEFINE1(sysctl, struct compat_sysctl_args __user *, args)
 {
 	struct compat_sysctl_args tmp;
 	compat_size_t __user *compat_oldlenp;