mips: don't bother with compat_sys_futex() wrappers
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 26 Dec 2012 04:22:15 +0000 (23:22 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Sun, 3 Feb 2013 23:33:01 +0000 (18:33 -0500)
... it's COMPAT_SYSCALL_DEFINE now

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
arch/mips/kernel/linux32.c
arch/mips/kernel/scall64-n32.S
arch/mips/kernel/scall64-o32.S

index 703b37e13f782768552e844cb94fd2855f12b0cf..498a7ec656d8e223155437d84680a1dd557f7dad 100644 (file)
@@ -312,10 +312,3 @@ SYSCALL_DEFINE6(32_fanotify_mark, int, fanotify_fd, unsigned int, flags,
        return sys_fanotify_mark(fanotify_fd, flags, merge_64(a3, a4),
                                 dfd, pathname);
 }
-
-SYSCALL_DEFINE6(32_futex, u32 __user *, uaddr, int, op, u32, val,
-               struct compat_timespec __user *, utime, u32 __user *, uaddr2,
-               u32, val3)
-{
-       return compat_sys_futex(uaddr, op, val, utime, uaddr2, val3);
-}
index 572ab50ff09848f8895cd12ecbfbeb8ec1262c1e..4b335467ea3fd620a7f8a784196fd1c078ce973d 100644 (file)
@@ -298,7 +298,7 @@ EXPORT(sysn32_call_table)
        PTR     sys_fremovexattr
        PTR     sys_tkill
        PTR     sys_ni_syscall
-       PTR     sys_32_futex
+       PTR     compat_sys_futex
        PTR     compat_sys_sched_setaffinity    /* 6195 */
        PTR     compat_sys_sched_getaffinity
        PTR     sys_cacheflush
index aa29c3318fbc63d7d65fc00bac07e064d572bdaa..78e1ef17abcc1d401ef9825b575958142778a28d 100644 (file)
@@ -430,7 +430,7 @@ sys_call_table:
        PTR     sys_fremovexattr                /* 4235 */
        PTR     sys_tkill
        PTR     sys_sendfile64
-       PTR     sys_32_futex
+       PTR     compat_sys_futex
        PTR     compat_sys_sched_setaffinity
        PTR     compat_sys_sched_getaffinity    /* 4240 */
        PTR     compat_sys_io_setup