From: Heiko Carstens Signed-off-by: Heiko Carstens Cc: Michael Kerrisk Cc: Davide Libenzi Signed-off-by: Andrew Morton --- arch/s390/kernel/compat_wrapper.S | 8 -------- arch/s390/kernel/syscalls.S | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff -puN arch/s390/kernel/compat_wrapper.S~timerfd-v3-new-timerfd-api-s390-fix arch/s390/kernel/compat_wrapper.S --- a/arch/s390/kernel/compat_wrapper.S~timerfd-v3-new-timerfd-api-s390-fix +++ a/arch/s390/kernel/compat_wrapper.S @@ -1698,14 +1698,6 @@ compat_sys_signalfd_wrapper: llgfr %r4,%r4 # compat_size_t jg compat_sys_signalfd - .globl compat_sys_timerfd_wrapper -compat_sys_timerfd_wrapper: - lgfr %r2,%r2 # int - lgfr %r3,%r3 # int - lgfr %r4,%r4 # int - llgtr %r5,%r5 # struct compat_itimerspec * - jg compat_sys_timerfd - .globl sys_eventfd_wrapper sys_eventfd_wrapper: llgfr %r2,%r2 # unsigned int diff -puN arch/s390/kernel/syscalls.S~timerfd-v3-new-timerfd-api-s390-fix arch/s390/kernel/syscalls.S --- a/arch/s390/kernel/syscalls.S~timerfd-v3-new-timerfd-api-s390-fix +++ a/arch/s390/kernel/syscalls.S @@ -325,5 +325,5 @@ SYSCALL(sys_utimes,sys_utimes,compat_sys SYSCALL(s390_fallocate,sys_fallocate,sys_fallocate_wrapper) SYSCALL(sys_utimensat,sys_utimensat,compat_sys_utimensat_wrapper) /* 315 */ SYSCALL(sys_signalfd,sys_signalfd,compat_sys_signalfd_wrapper) -SYSCALL(sys_timerfd,sys_ni_syscall,compat_sys_timerfd_wrapper) +NI_SYSCALL /* 317 old sys_timer_fd */ SYSCALL(sys_eventfd,sys_eventfd,sys_eventfd_wrapper) _