Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index cbd9901dc0f..30de2d0e52b 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -689,8 +689,6 @@ sys32_fdatasync_wrapper:
         llgfr   %r2,%r2                 # unsigned int
         jg      sys_fdatasync           # branch to system call
 
-#sys32_sysctl_wrapper                   # tbd
-
         .globl  sys32_mlock_wrapper
 sys32_mlock_wrapper:
         llgfr   %r2,%r2                 # unsigned long
@@ -1087,8 +1085,8 @@ sys32_stime_wrapper:
 
         .globl  sys32_sysctl_wrapper
 sys32_sysctl_wrapper:
-        llgtr   %r2,%r2                 # struct __sysctl_args32 *
-        jg      sys32_sysctl
+        llgtr   %r2,%r2                 # struct compat_sysctl_args *
+        jg      compat_sys_sysctl
 
         .globl  sys32_fstat64_wrapper
 sys32_fstat64_wrapper: