aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-03-05 20:10:59 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-05-09 13:46:38 -0400
commit91c2e0bcae72a3086c698b5de2b950b885abb0e6 (patch)
tree89f738ca8f9519f0fd3b22dd6cfb3dc69d98cfab /arch/mips
parent5522ddb3fc0dfd4a503c8278eafd88c9f2d3fada (diff)
unify compat fanotify_mark(2), switch to COMPAT_SYSCALL_DEFINE
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/kernel/linux32.c7
-rw-r--r--arch/mips/kernel/scall64-o32.S2
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index d1d576b765f5..0b29646bcee7 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -165,10 +165,3 @@ asmlinkage long sys32_fallocate(int fd, int mode, unsigned offset_a2,
165 return sys_fallocate(fd, mode, merge_64(offset_a2, offset_a3), 165 return sys_fallocate(fd, mode, merge_64(offset_a2, offset_a3),
166 merge_64(len_a4, len_a5)); 166 merge_64(len_a4, len_a5));
167} 167}
168
169SYSCALL_DEFINE6(32_fanotify_mark, int, fanotify_fd, unsigned int, flags,
170 u64, a3, u64, a4, int, dfd, const char __user *, pathname)
171{
172 return sys_fanotify_mark(fanotify_fd, flags, merge_64(a3, a4),
173 dfd, pathname);
174}
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 103bfe570fe8..74f485d3c0ef 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -529,7 +529,7 @@ sys_call_table:
529 PTR sys_accept4 529 PTR sys_accept4
530 PTR compat_sys_recvmmsg /* 4335 */ 530 PTR compat_sys_recvmmsg /* 4335 */
531 PTR sys_fanotify_init 531 PTR sys_fanotify_init
532 PTR sys_32_fanotify_mark 532 PTR compat_sys_fanotify_mark
533 PTR sys_prlimit64 533 PTR sys_prlimit64
534 PTR sys_name_to_handle_at 534 PTR sys_name_to_handle_at
535 PTR compat_sys_open_by_handle_at /* 4340 */ 535 PTR compat_sys_open_by_handle_at /* 4340 */