[MIPS] Replace sys32_timer_create with the generic compat_sys_timer_create.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

3 files changed, 2 insertions, 33 deletions

diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index b701ecb47cbd..30d433f14f93 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -544,37 +544,6 @@ asmlinkage long sys32_sync_file_range(int fd, int __pad,
                         flags);
 }
 
-struct sigevent32 {
-        u32 sigev_value;
-        u32 sigev_signo;
-        u32 sigev_notify;
-        u32 payload[(64 / 4) - 3];
-};
-
-extern asmlinkage long
-sys_timer_create(clockid_t which_clock,
-                 struct sigevent __user *timer_event_spec,
-                 timer_t __user * created_timer_id);
-
-long
-sys32_timer_create(u32 clock, struct sigevent32 __user *se32, timer_t __user *timer_id)
-{
-        struct sigevent __user *p = NULL;
-        if (se32) {
-                struct sigevent se;
-                p = compat_alloc_user_space(sizeof(struct sigevent));
-                memset(&se, 0, sizeof(struct sigevent));
-                if (get_user(se.sigev_value.sival_int,  &se32->sigev_value) ||
-                    __get_user(se.sigev_signo, &se32->sigev_signo) ||
-                    __get_user(se.sigev_notify, &se32->sigev_notify) ||
-                    __copy_from_user(&se._sigev_un._pad, &se32->payload,
-                                     sizeof(se32->payload)) ||
-                    copy_to_user(p, &se, sizeof(se)))
-                        return -EFAULT;
-        }
-        return sys_timer_create(clock, p, timer_id);
-}
-
 save_static_function(sys32_clone);
 __attribute_used__ noinline static int
 _sys32_clone(nabi_no_regargs struct pt_regs regs)
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index dedc9070bc62..f17e31e3bff2 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -340,7 +340,7 @@ EXPORT(sysn32_call_table)
         PTR     compat_sys_statfs64
         PTR     compat_sys_fstatfs64
         PTR     sys_sendfile64
-        PTR     sys32_timer_create              /* 6220 */
+        PTR     compat_sys_timer_create         /* 6220 */
         PTR     compat_sys_timer_settime
         PTR     compat_sys_timer_gettime
         PTR     sys_timer_getoverrun
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 70e223352fe2..142c9b70c026 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -462,7 +462,7 @@ sys_call_table:
         PTR     sys_fadvise64_64
         PTR     compat_sys_statfs64             /* 4255 */
         PTR     compat_sys_fstatfs64
-        PTR     sys32_timer_create
+        PTR     compat_sys_timer_create
         PTR     compat_sys_timer_settime
         PTR     compat_sys_timer_gettime
         PTR     sys_timer_getoverrun            /* 4260 */