2 files changed, 1 insertions, 33 deletions

diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 41b197a3f3a3..cd3b3c3e7a9f 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -1014,38 +1014,6 @@ asmlinkage long sys32_clone(struct pt_regs regs)
 }
 
 /*
- * Wrapper function for sys_timer_create.
- */
-extern asmlinkage long
-sys_timer_create(clockid_t, struct sigevent *, timer_t *);
-
-asmlinkage long
-sys32_timer_create(clockid_t which_clock, struct compat_sigevent *se32,
-                timer_t *timer_id)
-{
-        struct sigevent se;
-        timer_t ktimer_id;
-        mm_segment_t old_fs;
-        long ret;
-
-        if (se32 == NULL)
-                return sys_timer_create(which_clock, NULL, timer_id);
-
-        if (get_compat_sigevent(&se, se32))
-                return -EFAULT;
-
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-        ret = sys_timer_create(which_clock, &se, &ktimer_id);
-        set_fs(old_fs);
-
-        if (!ret)
-                ret = put_user (ktimer_id, timer_id);
-
-        return ret;
-}
-
-/*
  * 31 bit emulation wrapper functions for sys_fadvise64/fadvise64_64.
  * These need to rewrite the advise values for POSIX_FADV_{DONTNEED,NOREUSE}
  * because the 31 bit values differ from the 64 bit values.
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 23fe94e58688..cfde1905d07d 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -1289,7 +1289,7 @@ sys32_timer_create_wrapper:
         lgfr    %r2,%r2                 # timer_t (int)
         llgtr   %r3,%r3                 # struct compat_sigevent *
         llgtr   %r4,%r4                 # timer_t *
-        jg      sys32_timer_create
+        jg      compat_sys_timer_create
 
         .globl  sys32_timer_settime_wrapper
 sys32_timer_settime_wrapper: