s390/compat: get rid of compat wrapper assembly code

Now that all compat syscalls have been converted to use the
COMPAT_SYSCALL_DEFINE macros, we don't need to compat syscall
wrapper assembly code anymore.
So remove it and fix up the system call table accordingly.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

7 files changed, 66 insertions, 439 deletions

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 725515f9c5db..1b3ac09c11b6 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -50,7 +50,6 @@ compat-obj-$(CONFIG_AUDIT)	+= compat_audit.o
 obj-$(CONFIG_COMPAT)            += compat_linux.o compat_signal.o \
                                         compat_wrapper.o compat_exec_domain.o \
                                         $(compat-obj-y)
-obj-$(CONFIG_COMPAT)            += compat_wrap.o
 
 obj-$(CONFIG_STACKTRACE)        += stacktrace.o
 obj-$(CONFIG_KPROBES)           += kprobes.o
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h
index 330e11d164d7..39ddfdb40ae8 100644
--- a/arch/s390/kernel/compat_linux.h
+++ b/arch/s390/kernel/compat_linux.h
@@ -112,5 +112,7 @@ long compat_sys_s390_fadvise64(int fd, u32 high, u32 low, compat_size_t len, int
 long compat_sys_s390_fadvise64_64(struct fadvise64_64_args __user *args);
 long compat_sys_s390_sync_file_range(int fd, u32 offhigh, u32 offlow, u32 nhigh, u32 nlow, unsigned int flags);
 long compat_sys_s390_fallocate(int fd, int mode, u32 offhigh, u32 offlow, u32 lenhigh, u32 lenlow);
+long compat_sys_sigreturn(void);
+long compat_sys_rt_sigreturn(void);
 
 #endif /* _ASM_S390X_S390_H */
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index 8b84bc373e94..7df5ed9f44d7 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -241,7 +241,7 @@ static int restore_sigregs_gprs_high(struct pt_regs *regs, __u32 __user *uregs)
         return 0;
 }
 
-asmlinkage long sys32_sigreturn(void)
+COMPAT_SYSCALL_DEFINE0(sigreturn)
 {
         struct pt_regs *regs = task_pt_regs(current);
         sigframe32 __user *frame = (sigframe32 __user *)regs->gprs[15];
@@ -260,7 +260,7 @@ badframe:
         return 0;
 }
 
-asmlinkage long sys32_rt_sigreturn(void)
+COMPAT_SYSCALL_DEFINE0(rt_sigreturn)
 {
         struct pt_regs *regs = task_pt_regs(current);
         rt_sigframe32 __user *frame = (rt_sigframe32 __user *)regs->gprs[15];
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
deleted file mode 100644
index 23d9f8a7c6f5..000000000000
--- a/arch/s390/kernel/compat_wrapper.S
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
-*    wrapper for 31 bit compatible system calls.
-*
-*    Copyright IBM Corp. 2000, 2006
-*    Author(s): Gerhard Tonn (ton@de.ibm.com),
-*               Thomas Spatzier (tspat@de.ibm.com)
-*/
-
-#include <linux/linkage.h>
-
-ENTRY(sys32_time_wrapper)
-        llgtr   %r2,%r2                 # int *
-        jg      compat_sys_time         # branch to system call
-
-#sys32_getpid_wrapper                           # void
-
-ENTRY(sys32_mount_wrapper)
-        llgtr   %r2,%r2                 # char *
-        llgtr   %r3,%r3                 # char *
-        llgtr   %r4,%r4                 # char *
-        llgfr   %r5,%r5                 # unsigned long
-        llgtr   %r6,%r6                 # void *
-        jg      compat_sys_mount        # branch to system call
-
-ENTRY(sys32_ptrace_wrapper)
-        lgfr    %r2,%r2                 # long
-        lgfr    %r3,%r3                 # long
-        llgtr   %r4,%r4                 # long
-        llgfr   %r5,%r5                 # long
-        jg      compat_sys_ptrace       # branch to system call
-
-ENTRY(compat_sys_utime_wrapper)
-        llgtr   %r2,%r2                 # char *
-        llgtr   %r3,%r3                 # struct compat_utimbuf *
-        jg      compat_sys_utime        # branch to system call
-
-ENTRY(compat_sys_times_wrapper)
-        llgtr   %r2,%r2                 # struct compat_tms *
-        jg      compat_sys_times        # branch to system call
-
-ENTRY(compat_sys_ioctl_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgfr   %r3,%r3                 # unsigned int
-        llgfr   %r4,%r4                 # unsigned int
-        jg      compat_sys_ioctl        # branch to system call
-
-ENTRY(compat_sys_fcntl_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgfr   %r3,%r3                 # unsigned int
-        llgfr   %r4,%r4                 # unsigned long
-        jg      compat_sys_fcntl        # branch to system call
-
-ENTRY(sys32_ustat_wrapper)
-        llgfr   %r2,%r2                 # dev_t
-        llgtr   %r3,%r3                 # struct ustat *
-        jg      compat_sys_ustat
-
-ENTRY(compat_sys_sigpending_wrapper)
-        llgtr   %r2,%r2                 # compat_old_sigset_t *
-        jg      compat_sys_sigpending   # branch to system call
-
-ENTRY(compat_sys_setrlimit_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgtr   %r3,%r3                 # struct rlimit_emu31 *
-        jg      compat_sys_setrlimit    # branch to system call
-
-ENTRY(compat_sys_old_getrlimit_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgtr   %r3,%r3                 # struct rlimit_emu31 *
-        jg      compat_sys_old_getrlimit # branch to system call
-
-ENTRY(compat_sys_getrlimit_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgtr   %r3,%r3                 # struct rlimit_emu31 *
-        jg      compat_sys_getrlimit    # branch to system call
-
-ENTRY(compat_sys_gettimeofday_wrapper)
-        llgtr   %r2,%r2                 # struct timeval_emu31 *
-        llgtr   %r3,%r3                 # struct timezone *
-        jg      compat_sys_gettimeofday # branch to system call
-
-ENTRY(compat_sys_settimeofday_wrapper)
-        llgtr   %r2,%r2                 # struct timeval_emu31 *
-        llgtr   %r3,%r3                 # struct timezone *
-        jg      compat_sys_settimeofday # branch to system call
-
-ENTRY(old32_readdir_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgtr   %r3,%r3                 # void *
-        llgfr   %r4,%r4                 # unsigned int
-        jg      compat_sys_old_readdir  # branch to system call
-
-ENTRY(compat_sys_statfs_wrapper)
-        llgtr   %r2,%r2                 # char *
-        llgtr   %r3,%r3                 # struct compat_statfs *
-        jg      compat_sys_statfs       # branch to system call
-
-ENTRY(compat_sys_fstatfs_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgtr   %r3,%r3                 # struct compat_statfs *
-        jg      compat_sys_fstatfs      # branch to system call
-
-ENTRY(compat_sys_socketcall_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgtr   %r3,%r3                 # u32 *
-        jg      compat_sys_socketcall   # branch to system call
-
-ENTRY(compat_sys_newstat_wrapper)
-        llgtr   %r2,%r2                 # char *
-        llgtr   %r3,%r3                 # struct stat_emu31 *
-        jg      compat_sys_newstat      # branch to system call
-
-ENTRY(compat_sys_newlstat_wrapper)
-        llgtr   %r2,%r2                 # char *
-        llgtr   %r3,%r3                 # struct stat_emu31 *
-        jg      compat_sys_newlstat     # branch to system call
-
-ENTRY(compat_sys_newfstat_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgtr   %r3,%r3                 # struct stat_emu31 *
-        jg      compat_sys_newfstat     # branch to system call
-
-ENTRY(compat_sys_sysinfo_wrapper)
-        llgtr   %r2,%r2                 # struct sysinfo_emu31 *
-        jg      compat_sys_sysinfo      # branch to system call
-
-ENTRY(compat_sys_adjtimex_wrapper)
-        llgtr   %r2,%r2                 # struct compat_timex *
-        jg      compat_sys_adjtimex     # branch to system call
-
-ENTRY(sys32_getdents_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgtr   %r3,%r3                 # void *
-        llgfr   %r4,%r4                 # unsigned int
-        jg      compat_sys_getdents     # branch to system call
-
-ENTRY(compat_sys_select_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgtr   %r3,%r3                 # compat_fd_set *
-        llgtr   %r4,%r4                 # compat_fd_set *
-        llgtr   %r5,%r5                 # compat_fd_set *
-        llgtr   %r6,%r6                 # struct compat_timeval *
-        jg      compat_sys_select       # branch to system call
-
-ENTRY(compat_sys_readv_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgtr   %r3,%r3                 # const struct compat_iovec *
-        llgfr   %r4,%r4                 # unsigned long
-        jg      compat_sys_readv        # branch to system call
-
-ENTRY(compat_sys_writev_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgtr   %r3,%r3                 # const struct compat_iovec *
-        llgfr   %r4,%r4                 # unsigned long
-        jg      compat_sys_writev       # branch to system call
-
-ENTRY(compat_sys_nanosleep_wrapper)
-        llgtr   %r2,%r2                 # struct compat_timespec *
-        llgtr   %r3,%r3                 # struct compat_timespec *
-        jg      compat_sys_nanosleep            # branch to system call
-
-ENTRY(compat_sys_fcntl64_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgfr   %r3,%r3                 # unsigned int
-        llgfr   %r4,%r4                 # unsigned long
-        jg      compat_sys_fcntl64      # branch to system call
-
-ENTRY(sys32_stime_wrapper)
-        llgtr   %r2,%r2                 # long *
-        jg      compat_sys_stime        # branch to system call
-
-ENTRY(sys32_sched_setaffinity_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgfr   %r3,%r3                 # unsigned int
-        llgtr   %r4,%r4                 # unsigned long *
-        jg      compat_sys_sched_setaffinity
-
-ENTRY(sys32_sched_getaffinity_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgfr   %r3,%r3                 # unsigned int
-        llgtr   %r4,%r4                 # unsigned long *
-        jg      compat_sys_sched_getaffinity
-
-ENTRY(sys32_clock_settime_wrapper)
-        lgfr    %r2,%r2                 # clockid_t (int)
-        llgtr   %r3,%r3                 # struct compat_timespec *
-        jg      compat_sys_clock_settime
-
-ENTRY(sys32_clock_gettime_wrapper)
-        lgfr    %r2,%r2                 # clockid_t (int)
-        llgtr   %r3,%r3                 # struct compat_timespec *
-        jg      compat_sys_clock_gettime
-
-ENTRY(sys32_clock_getres_wrapper)
-        lgfr    %r2,%r2                 # clockid_t (int)
-        llgtr   %r3,%r3                 # struct compat_timespec *
-        jg      compat_sys_clock_getres
-
-ENTRY(sys32_clock_nanosleep_wrapper)
-        lgfr    %r2,%r2                 # clockid_t (int)
-        lgfr    %r3,%r3                 # int
-        llgtr   %r4,%r4                 # struct compat_timespec *
-        llgtr   %r5,%r5                 # struct compat_timespec *
-        jg      compat_sys_clock_nanosleep
-
-ENTRY(sys32_timer_create_wrapper)
-        lgfr    %r2,%r2                 # timer_t (int)
-        llgtr   %r3,%r3                 # struct compat_sigevent *
-        llgtr   %r4,%r4                 # timer_t *
-        jg      compat_sys_timer_create
-
-ENTRY(sys32_timer_settime_wrapper)
-        lgfr    %r2,%r2                 # timer_t (int)
-        lgfr    %r3,%r3                 # int
-        llgtr   %r4,%r4                 # struct compat_itimerspec *
-        llgtr   %r5,%r5                 # struct compat_itimerspec *
-        jg      compat_sys_timer_settime
-
-ENTRY(sys32_timer_gettime_wrapper)
-        lgfr    %r2,%r2                 # timer_t (int)
-        llgtr   %r3,%r3                 # struct compat_itimerspec *
-        jg      compat_sys_timer_gettime
-
-ENTRY(sys32_io_setup_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgtr   %r3,%r3                 # u32 *
-        jg      compat_sys_io_setup
-
-ENTRY(sys32_io_getevents_wrapper)
-        llgfr   %r2,%r2                 # (aio_context_t) u32
-        lgfr    %r3,%r3                 # long
-        lgfr    %r4,%r4                 # long
-        llgtr   %r5,%r5                 # struct io_event *
-        llgtr   %r6,%r6                 # struct compat_timespec *
-        jg      compat_sys_io_getevents
-
-ENTRY(sys32_io_submit_wrapper)
-        llgfr   %r2,%r2                 # (aio_context_t) u32
-        lgfr    %r3,%r3                 # long
-        llgtr   %r4,%r4                 # struct iocb **
-        jg      compat_sys_io_submit
-
-ENTRY(compat_sys_statfs64_wrapper)
-        llgtr   %r2,%r2                 # const char *
-        llgfr   %r3,%r3                 # compat_size_t
-        llgtr   %r4,%r4                 # struct compat_statfs64 *
-        jg      compat_sys_statfs64
-
-ENTRY(compat_sys_fstatfs64_wrapper)
-        llgfr   %r2,%r2                 # unsigned int fd
-        llgfr   %r3,%r3                 # compat_size_t
-        llgtr   %r4,%r4                 # struct compat_statfs64 *
-        jg      compat_sys_fstatfs64
-
-ENTRY(compat_sys_mq_open_wrapper)
-        llgtr   %r2,%r2                 # const char *
-        lgfr    %r3,%r3                 # int
-        llgfr   %r4,%r4                 # mode_t
-        llgtr   %r5,%r5                 # struct compat_mq_attr *
-        jg      compat_sys_mq_open
-
-ENTRY(compat_sys_mq_timedsend_wrapper)
-        lgfr    %r2,%r2                 # mqd_t
-        llgtr   %r3,%r3                 # const char *
-        llgfr   %r4,%r4                 # size_t
-        llgfr   %r5,%r5                 # unsigned int
-        llgtr   %r6,%r6                 # const struct compat_timespec *
-        jg      compat_sys_mq_timedsend
-
-ENTRY(compat_sys_mq_timedreceive_wrapper)
-        lgfr    %r2,%r2                 # mqd_t
-        llgtr   %r3,%r3                 # char *
-        llgfr   %r4,%r4                 # size_t
-        llgtr   %r5,%r5                 # unsigned int *
-        llgtr   %r6,%r6                 # const struct compat_timespec *
-        jg      compat_sys_mq_timedreceive
-
-ENTRY(compat_sys_mq_notify_wrapper)
-        lgfr    %r2,%r2                 # mqd_t
-        llgtr   %r3,%r3                 # struct compat_sigevent *
-        jg      compat_sys_mq_notify
-
-ENTRY(compat_sys_mq_getsetattr_wrapper)
-        lgfr    %r2,%r2                 # mqd_t
-        llgtr   %r3,%r3                 # struct compat_mq_attr *
-        llgtr   %r4,%r4                 # struct compat_mq_attr *
-        jg      compat_sys_mq_getsetattr
-
-ENTRY(compat_sys_kexec_load_wrapper)
-        llgfr   %r2,%r2                 # unsigned long
-        llgfr   %r3,%r3                 # unsigned long
-        llgtr   %r4,%r4                 # struct kexec_segment *
-        llgfr   %r5,%r5                 # unsigned long
-        jg      compat_sys_kexec_load
-
-ENTRY(compat_sys_futimesat_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgtr   %r3,%r3                 # char *
-        llgtr   %r4,%r4                 # struct timeval *
-        jg      compat_sys_futimesat
-
-ENTRY(compat_sys_pselect6_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgtr   %r3,%r3                 # fd_set *
-        llgtr   %r4,%r4                 # fd_set *
-        llgtr   %r5,%r5                 # fd_set *
-        llgtr   %r6,%r6                 # struct timespec *
-        llgt    %r0,164(%r15)           # void *
-        stg     %r0,160(%r15)
-        jg      compat_sys_pselect6
-
-ENTRY(compat_sys_ppoll_wrapper)
-        llgtr   %r2,%r2                 # struct pollfd *
-        llgfr   %r3,%r3                 # unsigned int
-        llgtr   %r4,%r4                 # struct timespec *
-        llgtr   %r5,%r5                 # const sigset_t *
-        llgfr   %r6,%r6                 # size_t
-        jg      compat_sys_ppoll
-
-ENTRY(compat_sys_utimes_wrapper)
-        llgtr   %r2,%r2                 # char *
-        llgtr   %r3,%r3                 # struct compat_timeval *
-        jg      compat_sys_utimes
-
-ENTRY(compat_sys_utimensat_wrapper)
-        llgfr   %r2,%r2                 # unsigned int
-        llgtr   %r3,%r3                 # char *
-        llgtr   %r4,%r4                 # struct compat_timespec *
-        lgfr    %r5,%r5                 # int
-        jg      compat_sys_utimensat
-
-ENTRY(compat_sys_keyctl_wrapper)
-        llgfr   %r2,%r2                 # u32
-        llgfr   %r3,%r3                 # u32
-        llgfr   %r4,%r4                 # u32
-        llgfr   %r5,%r5                 # u32
-        llgfr   %r6,%r6                 # u32
-        jg      compat_sys_keyctl       # branch to system call
-
-ENTRY(sys32_execve_wrapper)
-        llgtr   %r2,%r2                 # char *
-        llgtr   %r3,%r3                 # compat_uptr_t *
-        llgtr   %r4,%r4                 # compat_uptr_t *
-        jg      compat_sys_execve       # branch to system call
-
-ENTRY(compat_sys_clock_adjtime_wrapper)
-        lgfr    %r2,%r2                 # clockid_t (int)
-        llgtr   %r3,%r3                 # struct compat_timex __user *
-        jg      compat_sys_clock_adjtime
-
-ENTRY(compat_sys_process_vm_readv_wrapper)
-        lgfr    %r2,%r2                 # compat_pid_t
-        llgtr   %r3,%r3                 # struct compat_iovec __user *
-        llgfr   %r4,%r4                 # unsigned long
-        llgtr   %r5,%r5                 # struct compat_iovec __user *
-        llgfr   %r6,%r6                 # unsigned long
-        llgf    %r0,164(%r15)           # unsigned long
-        stg     %r0,160(%r15)
-        jg      compat_sys_process_vm_readv
-
-ENTRY(compat_sys_process_vm_writev_wrapper)
-        lgfr    %r2,%r2                 # compat_pid_t
-        llgtr   %r3,%r3                 # struct compat_iovec __user *
-        llgfr   %r4,%r4                 # unsigned long
-        llgtr   %r5,%r5                 # struct compat_iovec __user *
-        llgfr   %r6,%r6                 # unsigned long
-        llgf    %r0,164(%r15)           # unsigned long
-        stg     %r0,160(%r15)
-        jg      compat_sys_process_vm_writev
diff --git a/arch/s390/kernel/compat_wrap.c b/arch/s390/kernel/compat_wrapper.c
index d123f5d87b82..d123f5d87b82 100644
--- a/arch/s390/kernel/compat_wrap.c
+++ b/arch/s390/kernel/compat_wrapper.c
diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index e9167889ff1a..6ac78192455f 100644
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -67,11 +67,6 @@ struct s390_mmap_arg_struct;
 struct fadvise64_64_args;
 struct old_sigaction;
 
-long sys_sigreturn(void);
-long sys_rt_sigreturn(void);
-long sys32_sigreturn(void);
-long sys32_rt_sigreturn(void);
-
 long sys_s390_personality(unsigned int personality);
 long sys_s390_runtime_instr(int command, int signum);
 
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index dbdec47e935a..542ef488bac1 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -19,9 +19,9 @@ SYSCALL(sys_restart_syscall,sys_restart_syscall,sys_restart_syscall)
 SYSCALL(sys_creat,sys_creat,compat_sys_creat)
 SYSCALL(sys_link,sys_link,compat_sys_link)
 SYSCALL(sys_unlink,sys_unlink,compat_sys_unlink)                /* 10 */
-SYSCALL(sys_execve,sys_execve,sys32_execve_wrapper)
+SYSCALL(sys_execve,sys_execve,compat_sys_execve)
 SYSCALL(sys_chdir,sys_chdir,compat_sys_chdir)
-SYSCALL(sys_time,sys_ni_syscall,sys32_time_wrapper)             /* old time syscall */
+SYSCALL(sys_time,sys_ni_syscall,compat_sys_time)                /* old time syscall */
 SYSCALL(sys_mknod,sys_mknod,compat_sys_mknod)
 SYSCALL(sys_chmod,sys_chmod,compat_sys_chmod)                   /* 15 */
 SYSCALL(sys_lchown16,sys_ni_syscall,compat_sys_s390_lchown16)   /* old lchown16 syscall*/
@@ -29,16 +29,16 @@ NI_SYSCALL							/* old break syscall holder */
 NI_SYSCALL                                                      /* old stat syscall holder */
 SYSCALL(sys_lseek,sys_lseek,compat_sys_lseek)
 SYSCALL(sys_getpid,sys_getpid,sys_getpid)                       /* 20 */
-SYSCALL(sys_mount,sys_mount,sys32_mount_wrapper)
+SYSCALL(sys_mount,sys_mount,compat_sys_mount)
 SYSCALL(sys_oldumount,sys_oldumount,compat_sys_oldumount)
 SYSCALL(sys_setuid16,sys_ni_syscall,compat_sys_s390_setuid16)   /* old setuid16 syscall*/
 SYSCALL(sys_getuid16,sys_ni_syscall,compat_sys_s390_getuid16)   /* old getuid16 syscall*/
-SYSCALL(sys_stime,sys_ni_syscall,sys32_stime_wrapper)           /* 25 old stime syscall */
-SYSCALL(sys_ptrace,sys_ptrace,sys32_ptrace_wrapper)
+SYSCALL(sys_stime,sys_ni_syscall,compat_sys_stime)              /* 25 old stime syscall */
+SYSCALL(sys_ptrace,sys_ptrace,compat_sys_ptrace)
 SYSCALL(sys_alarm,sys_alarm,compat_sys_alarm)
 NI_SYSCALL                                                      /* old fstat syscall */
 SYSCALL(sys_pause,sys_pause,sys_pause)
-SYSCALL(sys_utime,sys_utime,compat_sys_utime_wrapper)           /* 30 */
+SYSCALL(sys_utime,sys_utime,compat_sys_utime)           /* 30 */
 NI_SYSCALL                                                      /* old stty syscall */
 NI_SYSCALL                                                      /* old gtty syscall */
 SYSCALL(sys_access,sys_access,compat_sys_access)
@@ -51,7 +51,7 @@ 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)
+SYSCALL(sys_times,sys_times,compat_sys_times)
 NI_SYSCALL                                                      /* old prof syscall */
 SYSCALL(sys_brk,sys_brk,compat_sys_brk)                         /* 45 */
 SYSCALL(sys_setgid16,sys_ni_syscall,compat_sys_s390_setgid16)   /* old setgid16 syscall*/
@@ -62,15 +62,15 @@ SYSCALL(sys_getegid16,sys_ni_syscall,compat_sys_s390_getegid16)	/* 50 old getegi
 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 */
+SYSCALL(sys_ioctl,sys_ioctl,compat_sys_ioctl)
+SYSCALL(sys_fcntl,sys_fcntl,compat_sys_fcntl)           /* 55 */
 NI_SYSCALL                                                      /* intel mpx syscall */
 SYSCALL(sys_setpgid,sys_setpgid,compat_sys_setpgid)
 NI_SYSCALL                                                      /* old ulimit syscall */
 NI_SYSCALL                                                      /* old uname syscall */
 SYSCALL(sys_umask,sys_umask,compat_sys_umask)                   /* 60 */
 SYSCALL(sys_chroot,sys_chroot,compat_sys_chroot)
-SYSCALL(sys_ustat,sys_ustat,sys32_ustat_wrapper)
+SYSCALL(sys_ustat,sys_ustat,compat_sys_ustat)
 SYSCALL(sys_dup2,sys_dup2,compat_sys_dup2)
 SYSCALL(sys_getppid,sys_getppid,sys_getppid)
 SYSCALL(sys_getpgrp,sys_getpgrp,sys_getpgrp)                    /* 65 */
@@ -81,13 +81,13 @@ NI_SYSCALL							/* old ssetmask syscall*/
 SYSCALL(sys_setreuid16,sys_ni_syscall,compat_sys_s390_setreuid16) /* old setreuid16 syscall */
 SYSCALL(sys_setregid16,sys_ni_syscall,compat_sys_s390_setregid16) /* old setregid16 syscall */
 SYSCALL(sys_sigsuspend,sys_sigsuspend,compat_sys_sigsuspend)
-SYSCALL(sys_sigpending,sys_sigpending,compat_sys_sigpending_wrapper)
+SYSCALL(sys_sigpending,sys_sigpending,compat_sys_sigpending)
 SYSCALL(sys_sethostname,sys_sethostname,compat_sys_sethostname)
-SYSCALL(sys_setrlimit,sys_setrlimit,compat_sys_setrlimit_wrapper)       /* 75 */
-SYSCALL(sys_old_getrlimit,sys_getrlimit,compat_sys_old_getrlimit_wrapper)
+SYSCALL(sys_setrlimit,sys_setrlimit,compat_sys_setrlimit)       /* 75 */
+SYSCALL(sys_old_getrlimit,sys_getrlimit,compat_sys_old_getrlimit)
 SYSCALL(sys_getrusage,sys_getrusage,compat_sys_getrusage)
-SYSCALL(sys_gettimeofday,sys_gettimeofday,compat_sys_gettimeofday_wrapper)
-SYSCALL(sys_settimeofday,sys_settimeofday,compat_sys_settimeofday_wrapper)
+SYSCALL(sys_gettimeofday,sys_gettimeofday,compat_sys_gettimeofday)
+SYSCALL(sys_settimeofday,sys_settimeofday,compat_sys_settimeofday)
 SYSCALL(sys_getgroups16,sys_ni_syscall,compat_sys_s390_getgroups16)     /* 80 old getgroups16 syscall */
 SYSCALL(sys_setgroups16,sys_ni_syscall,compat_sys_s390_setgroups16)     /* old setgroups16 syscall */
 NI_SYSCALL                                                      /* old select syscall */
@@ -97,7 +97,7 @@ SYSCALL(sys_readlink,sys_readlink,compat_sys_readlink)		/* 85 */
 SYSCALL(sys_uselib,sys_uselib,compat_sys_uselib)
 SYSCALL(sys_swapon,sys_swapon,compat_sys_swapon)
 SYSCALL(sys_reboot,sys_reboot,compat_sys_reboot)
-SYSCALL(sys_ni_syscall,sys_ni_syscall,old32_readdir_wrapper)    /* old readdir syscall */
+SYSCALL(sys_ni_syscall,sys_ni_syscall,compat_sys_old_readdir)   /* old readdir syscall */
 SYSCALL(sys_old_mmap,sys_old_mmap,compat_sys_s390_old_mmap)     /* 90 */
 SYSCALL(sys_munmap,sys_munmap,compat_sys_munmap)
 SYSCALL(sys_truncate,sys_truncate,compat_sys_truncate)
@@ -107,16 +107,16 @@ SYSCALL(sys_fchown16,sys_ni_syscall,compat_sys_s390_fchown16)	/* 95 old fchown16
 SYSCALL(sys_getpriority,sys_getpriority,compat_sys_getpriority)
 SYSCALL(sys_setpriority,sys_setpriority,compat_sys_setpriority)
 NI_SYSCALL                                                      /* old profil syscall */
-SYSCALL(sys_statfs,sys_statfs,compat_sys_statfs_wrapper)
-SYSCALL(sys_fstatfs,sys_fstatfs,compat_sys_fstatfs_wrapper)     /* 100 */
+SYSCALL(sys_statfs,sys_statfs,compat_sys_statfs)
+SYSCALL(sys_fstatfs,sys_fstatfs,compat_sys_fstatfs)     /* 100 */
 NI_SYSCALL                                                      /* ioperm for i386 */
-SYSCALL(sys_socketcall,sys_socketcall,compat_sys_socketcall_wrapper)
+SYSCALL(sys_socketcall,sys_socketcall,compat_sys_socketcall)
 SYSCALL(sys_syslog,sys_syslog,compat_sys_syslog)
 SYSCALL(sys_setitimer,sys_setitimer,compat_sys_setitimer)
 SYSCALL(sys_getitimer,sys_getitimer,compat_sys_getitimer)       /* 105 */
-SYSCALL(sys_newstat,sys_newstat,compat_sys_newstat_wrapper)
-SYSCALL(sys_newlstat,sys_newlstat,compat_sys_newlstat_wrapper)
-SYSCALL(sys_newfstat,sys_newfstat,compat_sys_newfstat_wrapper)
+SYSCALL(sys_newstat,sys_newstat,compat_sys_newstat)
+SYSCALL(sys_newlstat,sys_newlstat,compat_sys_newlstat)
+SYSCALL(sys_newfstat,sys_newfstat,compat_sys_newfstat)
 NI_SYSCALL                                                      /* old uname syscall */
 SYSCALL(sys_lookup_dcookie,sys_lookup_dcookie,compat_sys_lookup_dcookie)        /* 110 */
 SYSCALL(sys_vhangup,sys_vhangup,sys_vhangup)
@@ -124,15 +124,15 @@ NI_SYSCALL							/* old "idle" system call */
 NI_SYSCALL                                                      /* vm86old for i386 */
 SYSCALL(sys_wait4,sys_wait4,compat_sys_wait4)
 SYSCALL(sys_swapoff,sys_swapoff,compat_sys_swapoff)             /* 115 */
-SYSCALL(sys_sysinfo,sys_sysinfo,compat_sys_sysinfo_wrapper)
+SYSCALL(sys_sysinfo,sys_sysinfo,compat_sys_sysinfo)
 SYSCALL(sys_s390_ipc,sys_s390_ipc,compat_sys_s390_ipc)
 SYSCALL(sys_fsync,sys_fsync,compat_sys_fsync)
-SYSCALL(sys_sigreturn,sys_sigreturn,sys32_sigreturn)
+SYSCALL(sys_sigreturn,sys_sigreturn,compat_sys_sigreturn)
 SYSCALL(sys_clone,sys_clone,compat_sys_clone)                   /* 120 */
 SYSCALL(sys_setdomainname,sys_setdomainname,compat_sys_setdomainname)
 SYSCALL(sys_newuname,sys_newuname,compat_sys_newuname)
 NI_SYSCALL                                                      /* modify_ldt for i386 */
-SYSCALL(sys_adjtimex,sys_adjtimex,compat_sys_adjtimex_wrapper)
+SYSCALL(sys_adjtimex,sys_adjtimex,compat_sys_adjtimex)
 SYSCALL(sys_mprotect,sys_mprotect,compat_sys_mprotect)          /* 125 */
 SYSCALL(sys_sigprocmask,sys_sigprocmask,compat_sys_sigprocmask)
 NI_SYSCALL                                                      /* old "create module" */
@@ -149,12 +149,12 @@ NI_SYSCALL							/* for afs_syscall */
 SYSCALL(sys_setfsuid16,sys_ni_syscall,compat_sys_s390_setfsuid16)       /* old setfsuid16 syscall */
 SYSCALL(sys_setfsgid16,sys_ni_syscall,compat_sys_s390_setfsgid16)       /* old setfsgid16 syscall */
 SYSCALL(sys_llseek,sys_llseek,compat_sys_llseek)                /* 140 */
-SYSCALL(sys_getdents,sys_getdents,sys32_getdents_wrapper)
-SYSCALL(sys_select,sys_select,compat_sys_select_wrapper)
+SYSCALL(sys_getdents,sys_getdents,compat_sys_getdents)
+SYSCALL(sys_select,sys_select,compat_sys_select)
 SYSCALL(sys_flock,sys_flock,compat_sys_flock)
 SYSCALL(sys_msync,sys_msync,compat_sys_msync)
-SYSCALL(sys_readv,sys_readv,compat_sys_readv_wrapper)           /* 145 */
-SYSCALL(sys_writev,sys_writev,compat_sys_writev_wrapper)
+SYSCALL(sys_readv,sys_readv,compat_sys_readv)           /* 145 */
+SYSCALL(sys_writev,sys_writev,compat_sys_writev)
 SYSCALL(sys_getsid,sys_getsid,compat_sys_getsid)
 SYSCALL(sys_fdatasync,sys_fdatasync,compat_sys_fdatasync)
 SYSCALL(sys_sysctl,sys_sysctl,compat_sys_sysctl)
@@ -170,7 +170,7 @@ SYSCALL(sys_sched_yield,sys_sched_yield,sys_sched_yield)
 SYSCALL(sys_sched_get_priority_max,sys_sched_get_priority_max,compat_sys_sched_get_priority_max)
 SYSCALL(sys_sched_get_priority_min,sys_sched_get_priority_min,compat_sys_sched_get_priority_min)        /* 160 */
 SYSCALL(sys_sched_rr_get_interval,sys_sched_rr_get_interval,compat_sys_sched_rr_get_interval)
-SYSCALL(sys_nanosleep,sys_nanosleep,compat_sys_nanosleep_wrapper)
+SYSCALL(sys_nanosleep,sys_nanosleep,compat_sys_nanosleep)
 SYSCALL(sys_mremap,sys_mremap,compat_sys_mremap)
 SYSCALL(sys_setresuid16,sys_ni_syscall,compat_sys_s390_setresuid16)     /* old setresuid16 syscall */
 SYSCALL(sys_getresuid16,sys_ni_syscall,compat_sys_s390_getresuid16)     /* 165 old getresuid16 syscall */
@@ -181,7 +181,7 @@ NI_SYSCALL							/* old nfsservctl */
 SYSCALL(sys_setresgid16,sys_ni_syscall,compat_sys_s390_setresgid16)     /* 170 old setresgid16 syscall */
 SYSCALL(sys_getresgid16,sys_ni_syscall,compat_sys_s390_getresgid16)     /* old getresgid16 syscall */
 SYSCALL(sys_prctl,sys_prctl,compat_sys_prctl)
-SYSCALL(sys_rt_sigreturn,sys_rt_sigreturn,sys32_rt_sigreturn)
+SYSCALL(sys_rt_sigreturn,sys_rt_sigreturn,compat_sys_rt_sigreturn)
 SYSCALL(sys_rt_sigaction,sys_rt_sigaction,compat_sys_rt_sigaction)
 SYSCALL(sys_rt_sigprocmask,sys_rt_sigprocmask,compat_sys_rt_sigprocmask) /* 175 */
 SYSCALL(sys_rt_sigpending,sys_rt_sigpending,compat_sys_rt_sigpending)
@@ -199,7 +199,7 @@ SYSCALL(sys_sendfile,sys_sendfile64,compat_sys_sendfile)
 NI_SYSCALL                                                      /* streams1 */
 NI_SYSCALL                                                      /* streams2 */
 SYSCALL(sys_vfork,sys_vfork,sys_vfork)                          /* 190 */
-SYSCALL(sys_getrlimit,sys_getrlimit,compat_sys_getrlimit_wrapper)
+SYSCALL(sys_getrlimit,sys_getrlimit,compat_sys_getrlimit)
 SYSCALL(sys_mmap2,sys_mmap2,compat_sys_s390_mmap2)
 SYSCALL(sys_truncate64,sys_ni_syscall,compat_sys_s390_truncate64)
 SYSCALL(sys_ftruncate64,sys_ni_syscall,compat_sys_s390_ftruncate64)
@@ -229,7 +229,7 @@ SYSCALL(sys_pivot_root,sys_pivot_root,compat_sys_pivot_root)
 SYSCALL(sys_mincore,sys_mincore,compat_sys_mincore)
 SYSCALL(sys_madvise,sys_madvise,compat_sys_madvise)
 SYSCALL(sys_getdents64,sys_getdents64,compat_sys_getdents64)    /* 220 */
-SYSCALL(sys_fcntl64,sys_ni_syscall,compat_sys_fcntl64_wrapper)
+SYSCALL(sys_fcntl64,sys_ni_syscall,compat_sys_fcntl64)
 SYSCALL(sys_readahead,sys_readahead,compat_sys_s390_readahead)
 SYSCALL(sys_sendfile64,sys_ni_syscall,compat_sys_sendfile64)
 SYSCALL(sys_setxattr,sys_setxattr,compat_sys_setxattr)
@@ -247,14 +247,14 @@ SYSCALL(sys_fremovexattr,sys_fremovexattr,compat_sys_fremovexattr)	/* 235 */
 SYSCALL(sys_gettid,sys_gettid,sys_gettid)
 SYSCALL(sys_tkill,sys_tkill,compat_sys_tkill)
 SYSCALL(sys_futex,sys_futex,compat_sys_futex)
-SYSCALL(sys_sched_setaffinity,sys_sched_setaffinity,sys32_sched_setaffinity_wrapper)
-SYSCALL(sys_sched_getaffinity,sys_sched_getaffinity,sys32_sched_getaffinity_wrapper)    /* 240 */
+SYSCALL(sys_sched_setaffinity,sys_sched_setaffinity,compat_sys_sched_setaffinity)
+SYSCALL(sys_sched_getaffinity,sys_sched_getaffinity,compat_sys_sched_getaffinity)       /* 240 */
 SYSCALL(sys_tgkill,sys_tgkill,compat_sys_tgkill)
 NI_SYSCALL                                                      /* reserved for TUX */
-SYSCALL(sys_io_setup,sys_io_setup,sys32_io_setup_wrapper)
+SYSCALL(sys_io_setup,sys_io_setup,compat_sys_io_setup)
 SYSCALL(sys_io_destroy,sys_io_destroy,compat_sys_io_destroy)
-SYSCALL(sys_io_getevents,sys_io_getevents,sys32_io_getevents_wrapper)   /* 245 */
-SYSCALL(sys_io_submit,sys_io_submit,sys32_io_submit_wrapper)
+SYSCALL(sys_io_getevents,sys_io_getevents,compat_sys_io_getevents)      /* 245 */
+SYSCALL(sys_io_submit,sys_io_submit,compat_sys_io_submit)
 SYSCALL(sys_io_cancel,sys_io_cancel,compat_sys_io_cancel)
 SYSCALL(sys_exit_group,sys_exit_group,compat_sys_exit_group)
 SYSCALL(sys_epoll_create,sys_epoll_create,compat_sys_epoll_create)
@@ -262,33 +262,33 @@ SYSCALL(sys_epoll_ctl,sys_epoll_ctl,compat_sys_epoll_ctl)	/* 250 */
 SYSCALL(sys_epoll_wait,sys_epoll_wait,compat_sys_epoll_wait)
 SYSCALL(sys_set_tid_address,sys_set_tid_address,compat_sys_set_tid_address)
 SYSCALL(sys_s390_fadvise64,sys_fadvise64_64,compat_sys_s390_fadvise64)
-SYSCALL(sys_timer_create,sys_timer_create,sys32_timer_create_wrapper)
-SYSCALL(sys_timer_settime,sys_timer_settime,sys32_timer_settime_wrapper)        /* 255 */
-SYSCALL(sys_timer_gettime,sys_timer_gettime,sys32_timer_gettime_wrapper)
+SYSCALL(sys_timer_create,sys_timer_create,compat_sys_timer_create)
+SYSCALL(sys_timer_settime,sys_timer_settime,compat_sys_timer_settime)   /* 255 */
+SYSCALL(sys_timer_gettime,sys_timer_gettime,compat_sys_timer_gettime)
 SYSCALL(sys_timer_getoverrun,sys_timer_getoverrun,compat_sys_timer_getoverrun)
 SYSCALL(sys_timer_delete,sys_timer_delete,compat_sys_timer_delete)
-SYSCALL(sys_clock_settime,sys_clock_settime,sys32_clock_settime_wrapper)
-SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper)        /* 260 */
-SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
-SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper)
+SYSCALL(sys_clock_settime,sys_clock_settime,compat_sys_clock_settime)
+SYSCALL(sys_clock_gettime,sys_clock_gettime,compat_sys_clock_gettime)   /* 260 */
+SYSCALL(sys_clock_getres,sys_clock_getres,compat_sys_clock_getres)
+SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,compat_sys_clock_nanosleep)
 NI_SYSCALL                                                      /* reserved for vserver */
 SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,compat_sys_s390_fadvise64_64)
-SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
-SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
+SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64)
+SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64)
 SYSCALL(sys_remap_file_pages,sys_remap_file_pages,compat_sys_remap_file_pages)
 NI_SYSCALL                                                      /* 268 sys_mbind */
 NI_SYSCALL                                                      /* 269 sys_get_mempolicy */
 NI_SYSCALL                                                      /* 270 sys_set_mempolicy */
-SYSCALL(sys_mq_open,sys_mq_open,compat_sys_mq_open_wrapper)
+SYSCALL(sys_mq_open,sys_mq_open,compat_sys_mq_open)
 SYSCALL(sys_mq_unlink,sys_mq_unlink,compat_sys_mq_unlink)
-SYSCALL(sys_mq_timedsend,sys_mq_timedsend,compat_sys_mq_timedsend_wrapper)
-SYSCALL(sys_mq_timedreceive,sys_mq_timedreceive,compat_sys_mq_timedreceive_wrapper)
-SYSCALL(sys_mq_notify,sys_mq_notify,compat_sys_mq_notify_wrapper) /* 275 */
-SYSCALL(sys_mq_getsetattr,sys_mq_getsetattr,compat_sys_mq_getsetattr_wrapper)
-SYSCALL(sys_kexec_load,sys_kexec_load,compat_sys_kexec_load_wrapper)
+SYSCALL(sys_mq_timedsend,sys_mq_timedsend,compat_sys_mq_timedsend)
+SYSCALL(sys_mq_timedreceive,sys_mq_timedreceive,compat_sys_mq_timedreceive)
+SYSCALL(sys_mq_notify,sys_mq_notify,compat_sys_mq_notify) /* 275 */
+SYSCALL(sys_mq_getsetattr,sys_mq_getsetattr,compat_sys_mq_getsetattr)
+SYSCALL(sys_kexec_load,sys_kexec_load,compat_sys_kexec_load)
 SYSCALL(sys_add_key,sys_add_key,compat_sys_add_key)
 SYSCALL(sys_request_key,sys_request_key,compat_sys_request_key)
-SYSCALL(sys_keyctl,sys_keyctl,compat_sys_keyctl_wrapper)                /* 280 */
+SYSCALL(sys_keyctl,sys_keyctl,compat_sys_keyctl)                /* 280 */
 SYSCALL(sys_waitid,sys_waitid,compat_sys_waitid)
 SYSCALL(sys_ioprio_set,sys_ioprio_set,compat_sys_ioprio_set)
 SYSCALL(sys_ioprio_get,sys_ioprio_get,compat_sys_ioprio_get)
@@ -300,7 +300,7 @@ SYSCALL(sys_openat,sys_openat,compat_sys_openat)
 SYSCALL(sys_mkdirat,sys_mkdirat,compat_sys_mkdirat)
 SYSCALL(sys_mknodat,sys_mknodat,compat_sys_mknodat)     /* 290 */
 SYSCALL(sys_fchownat,sys_fchownat,compat_sys_fchownat)
-SYSCALL(sys_futimesat,sys_futimesat,compat_sys_futimesat_wrapper)
+SYSCALL(sys_futimesat,sys_futimesat,compat_sys_futimesat)
 SYSCALL(sys_fstatat64,sys_newfstatat,compat_sys_s390_fstatat64)
 SYSCALL(sys_unlinkat,sys_unlinkat,compat_sys_unlinkat)
 SYSCALL(sys_renameat,sys_renameat,compat_sys_renameat)  /* 295 */
@@ -309,8 +309,8 @@ SYSCALL(sys_symlinkat,sys_symlinkat,compat_sys_symlinkat)
 SYSCALL(sys_readlinkat,sys_readlinkat,compat_sys_readlinkat)
 SYSCALL(sys_fchmodat,sys_fchmodat,compat_sys_fchmodat)
 SYSCALL(sys_faccessat,sys_faccessat,compat_sys_faccessat)       /* 300 */
-SYSCALL(sys_pselect6,sys_pselect6,compat_sys_pselect6_wrapper)
-SYSCALL(sys_ppoll,sys_ppoll,compat_sys_ppoll_wrapper)
+SYSCALL(sys_pselect6,sys_pselect6,compat_sys_pselect6)
+SYSCALL(sys_ppoll,sys_ppoll,compat_sys_ppoll)
 SYSCALL(sys_unshare,sys_unshare,compat_sys_unshare)
 SYSCALL(sys_set_robust_list,sys_set_robust_list,compat_sys_set_robust_list)
 SYSCALL(sys_get_robust_list,sys_get_robust_list,compat_sys_get_robust_list)
@@ -321,9 +321,9 @@ SYSCALL(sys_vmsplice,sys_vmsplice,compat_sys_vmsplice)
 NI_SYSCALL                                                      /* 310 sys_move_pages */
 SYSCALL(sys_getcpu,sys_getcpu,compat_sys_getcpu)
 SYSCALL(sys_epoll_pwait,sys_epoll_pwait,compat_sys_epoll_pwait)
-SYSCALL(sys_utimes,sys_utimes,compat_sys_utimes_wrapper)
+SYSCALL(sys_utimes,sys_utimes,compat_sys_utimes)
 SYSCALL(sys_s390_fallocate,sys_fallocate,compat_sys_s390_fallocate)
-SYSCALL(sys_utimensat,sys_utimensat,compat_sys_utimensat_wrapper)       /* 315 */
+SYSCALL(sys_utimensat,sys_utimensat,compat_sys_utimensat)       /* 315 */
 SYSCALL(sys_signalfd,sys_signalfd,compat_sys_signalfd)
 NI_SYSCALL                                              /* 317 old sys_timer_fd */
 SYSCALL(sys_eventfd,sys_eventfd,compat_sys_eventfd)
@@ -345,11 +345,11 @@ SYSCALL(sys_fanotify_mark,sys_fanotify_mark,compat_sys_fanotify_mark)
 SYSCALL(sys_prlimit64,sys_prlimit64,compat_sys_prlimit64)
 SYSCALL(sys_name_to_handle_at,sys_name_to_handle_at,compat_sys_name_to_handle_at) /* 335 */
 SYSCALL(sys_open_by_handle_at,sys_open_by_handle_at,compat_sys_open_by_handle_at)
-SYSCALL(sys_clock_adjtime,sys_clock_adjtime,compat_sys_clock_adjtime_wrapper)
+SYSCALL(sys_clock_adjtime,sys_clock_adjtime,compat_sys_clock_adjtime)
 SYSCALL(sys_syncfs,sys_syncfs,compat_sys_syncfs)
 SYSCALL(sys_setns,sys_setns,compat_sys_setns)
-SYSCALL(sys_process_vm_readv,sys_process_vm_readv,compat_sys_process_vm_readv_wrapper) /* 340 */
-SYSCALL(sys_process_vm_writev,sys_process_vm_writev,compat_sys_process_vm_writev_wrapper)
+SYSCALL(sys_process_vm_readv,sys_process_vm_readv,compat_sys_process_vm_readv) /* 340 */
+SYSCALL(sys_process_vm_writev,sys_process_vm_writev,compat_sys_process_vm_writev)
 SYSCALL(sys_ni_syscall,sys_s390_runtime_instr,compat_sys_s390_runtime_instr)
 SYSCALL(sys_kcmp,sys_kcmp,compat_sys_kcmp)
 SYSCALL(sys_finit_module,sys_finit_module,compat_sys_finit_module)