diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 23:22:15 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:33:01 -0500 |
commit | 5e392b8db7471c15f587e5f206b7ca98282697e8 (patch) | |
tree | ec442a448cbd87724fb9623ac342f2877f20a815 | |
parent | aa584802e51fa3f28cc6efb1863fe9a3d197c9c8 (diff) |
mips: don't bother with compat_sys_futex() wrappers
... it's COMPAT_SYSCALL_DEFINE now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | arch/mips/kernel/linux32.c | 7 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-o32.S | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 703b37e13f78..498a7ec656d8 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
@@ -312,10 +312,3 @@ SYSCALL_DEFINE6(32_fanotify_mark, int, fanotify_fd, unsigned int, flags, | |||
312 | return sys_fanotify_mark(fanotify_fd, flags, merge_64(a3, a4), | 312 | return sys_fanotify_mark(fanotify_fd, flags, merge_64(a3, a4), |
313 | dfd, pathname); | 313 | dfd, pathname); |
314 | } | 314 | } |
315 | |||
316 | SYSCALL_DEFINE6(32_futex, u32 __user *, uaddr, int, op, u32, val, | ||
317 | struct compat_timespec __user *, utime, u32 __user *, uaddr2, | ||
318 | u32, val3) | ||
319 | { | ||
320 | return compat_sys_futex(uaddr, op, val, utime, uaddr2, val3); | ||
321 | } | ||
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 572ab50ff098..4b335467ea3f 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
@@ -298,7 +298,7 @@ EXPORT(sysn32_call_table) | |||
298 | PTR sys_fremovexattr | 298 | PTR sys_fremovexattr |
299 | PTR sys_tkill | 299 | PTR sys_tkill |
300 | PTR sys_ni_syscall | 300 | PTR sys_ni_syscall |
301 | PTR sys_32_futex | 301 | PTR compat_sys_futex |
302 | PTR compat_sys_sched_setaffinity /* 6195 */ | 302 | PTR compat_sys_sched_setaffinity /* 6195 */ |
303 | PTR compat_sys_sched_getaffinity | 303 | PTR compat_sys_sched_getaffinity |
304 | PTR sys_cacheflush | 304 | PTR sys_cacheflush |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index aa29c3318fbc..78e1ef17abcc 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
@@ -430,7 +430,7 @@ sys_call_table: | |||
430 | PTR sys_fremovexattr /* 4235 */ | 430 | PTR sys_fremovexattr /* 4235 */ |
431 | PTR sys_tkill | 431 | PTR sys_tkill |
432 | PTR sys_sendfile64 | 432 | PTR sys_sendfile64 |
433 | PTR sys_32_futex | 433 | PTR compat_sys_futex |
434 | PTR compat_sys_sched_setaffinity | 434 | PTR compat_sys_sched_setaffinity |
435 | PTR compat_sys_sched_getaffinity /* 4240 */ | 435 | PTR compat_sys_sched_getaffinity /* 4240 */ |
436 | PTR compat_sys_io_setup | 436 | PTR compat_sys_io_setup |