3 files changed, 20 insertions, 55 deletions

diff --git a/arch/s390/kernel/compat_wrap.c b/arch/s390/kernel/compat_wrap.c
index 5357190c814e..93f13f2350d4 100644
--- a/arch/s390/kernel/compat_wrap.c
+++ b/arch/s390/kernel/compat_wrap.c
@@ -33,3 +33,13 @@ COMPAT_SYSCALL_WRAP1(oldumount, char __user *, name);
 COMPAT_SYSCALL_WRAP1(alarm, unsigned int, seconds);
 COMPAT_SYSCALL_WRAP2(access, const char __user *, filename, int, mode);
 COMPAT_SYSCALL_WRAP1(nice, int, increment);
+COMPAT_SYSCALL_WRAP2(kill, int, pid, int, sig);
+COMPAT_SYSCALL_WRAP2(rename, const char __user *, oldname, const char __user *, newname);
+COMPAT_SYSCALL_WRAP2(mkdir, const char __user *, pathname, umode_t, mode);
+COMPAT_SYSCALL_WRAP1(rmdir, const char __user *, pathname);
+COMPAT_SYSCALL_WRAP1(dup, unsigned int, fildes);
+COMPAT_SYSCALL_WRAP1(pipe, int __user *, fildes);
+COMPAT_SYSCALL_WRAP1(brk, compat_ulong_t, brk);
+COMPAT_SYSCALL_WRAP2(signal, int, sig, __sighandler_t, handler);
+COMPAT_SYSCALL_WRAP1(acct, const char __user *, name);
+COMPAT_SYSCALL_WRAP2(umount, char __user *, name, int, flags);
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 09e65cd2e24e..e1b9d4ab0796 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -34,55 +34,10 @@ ENTRY(compat_sys_utime_wrapper)
         llgtr   %r3,%r3                 # struct compat_utimbuf *
         jg      compat_sys_utime        # branch to system call
 
-ENTRY(sys32_kill_wrapper)
-        lgfr    %r2,%r2                 # int
-        lgfr    %r3,%r3                 # int
-        jg      sys_kill                # branch to system call
-
-ENTRY(sys32_rename_wrapper)
-        llgtr   %r2,%r2                 # const char *
-        llgtr   %r3,%r3                 # const char *
-        jg      sys_rename              # branch to system call
-
-ENTRY(sys32_mkdir_wrapper)
-        llgtr   %r2,%r2                 # const char *
-        lgfr    %r3,%r3                 # int
-        jg      sys_mkdir               # branch to system call
-
-ENTRY(sys32_rmdir_wrapper)
-        llgtr   %r2,%r2                 # const char *
-        jg      sys_rmdir               # branch to system call
-
-ENTRY(sys32_dup_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        jg      sys_dup                 # branch to system call
-
-ENTRY(sys32_pipe_wrapper)
-        llgtr   %r2,%r2                 # u32 *
-        jg      sys_pipe                # branch to system call
-
 ENTRY(compat_sys_times_wrapper)
         llgtr   %r2,%r2                 # struct compat_tms *
         jg      compat_sys_times        # branch to system call
 
-ENTRY(sys32_brk_wrapper)
-        llgtr   %r2,%r2                 # unsigned long
-        jg      sys_brk                 # branch to system call
-
-ENTRY(sys32_signal_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgtr   %r3,%r3                 # __sighandler_t
-        jg      sys_signal
-
-ENTRY(sys32_acct_wrapper)
-        llgtr   %r2,%r2                 # char *
-        jg      sys_acct                # branch to system call
-
-ENTRY(sys32_umount_wrapper)
-        llgtr   %r2,%r2                 # char *
-        lgfr    %r3,%r3                 # int
-        jg      sys_umount              # branch to system call
-
 ENTRY(compat_sys_ioctl_wrapper)
         llgfr   %r2,%r2                 # unsigned int
         llgfr   %r3,%r3                 # unsigned int
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index ec1de1b3ecd2..da6bffd5c473 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -45,22 +45,22 @@ SYSCALL(sys_access,sys_access,compat_sys_access)
 SYSCALL(sys_nice,sys_nice,compat_sys_nice)
 NI_SYSCALL                                                      /* 35 old ftime syscall */
 SYSCALL(sys_sync,sys_sync,sys_sync)
-SYSCALL(sys_kill,sys_kill,sys32_kill_wrapper)
-SYSCALL(sys_rename,sys_rename,sys32_rename_wrapper)
-SYSCALL(sys_mkdir,sys_mkdir,sys32_mkdir_wrapper)
-SYSCALL(sys_rmdir,sys_rmdir,sys32_rmdir_wrapper)                /* 40 */
-SYSCALL(sys_dup,sys_dup,sys32_dup_wrapper)
-SYSCALL(sys_pipe,sys_pipe,sys32_pipe_wrapper)
+SYSCALL(sys_kill,sys_kill,compat_sys_kill)
+SYSCALL(sys_rename,sys_rename,compat_sys_rename)
+SYSCALL(sys_mkdir,sys_mkdir,compat_sys_mkdir)
+SYSCALL(sys_rmdir,sys_rmdir,compat_sys_rmdir)           /* 40 */
+SYSCALL(sys_dup,sys_dup,compat_sys_dup)
+SYSCALL(sys_pipe,sys_pipe,compat_sys_pipe)
 SYSCALL(sys_times,sys_times,compat_sys_times_wrapper)
 NI_SYSCALL                                                      /* old prof syscall */
-SYSCALL(sys_brk,sys_brk,sys32_brk_wrapper)                      /* 45 */
+SYSCALL(sys_brk,sys_brk,compat_sys_brk)                         /* 45 */
 SYSCALL(sys_setgid16,sys_ni_syscall,compat_sys_s390_setgid16)   /* old setgid16 syscall*/
 SYSCALL(sys_getgid16,sys_ni_syscall,compat_sys_s390_getgid16)   /* old getgid16 syscall*/
-SYSCALL(sys_signal,sys_signal,sys32_signal_wrapper)
+SYSCALL(sys_signal,sys_signal,compat_sys_signal)
 SYSCALL(sys_geteuid16,sys_ni_syscall,compat_sys_s390_geteuid16) /* old geteuid16 syscall */
 SYSCALL(sys_getegid16,sys_ni_syscall,compat_sys_s390_getegid16) /* 50 old getegid16 syscall */
-SYSCALL(sys_acct,sys_acct,sys32_acct_wrapper)
-SYSCALL(sys_umount,sys_umount,sys32_umount_wrapper)
+SYSCALL(sys_acct,sys_acct,compat_sys_acct)
+SYSCALL(sys_umount,sys_umount,compat_sys_umount)
 NI_SYSCALL                                                      /* old lock syscall */
 SYSCALL(sys_ioctl,sys_ioctl,compat_sys_ioctl_wrapper)
 SYSCALL(sys_fcntl,sys_fcntl,compat_sys_fcntl_wrapper)           /* 55 */