aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-02-25 18:42:04 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-03-03 23:00:23 -0500
commitd5dc77bfeeab0b03a32e3db5e31e2f64605634ab (patch)
tree7cdf557d1310db607d164d576d8cc5799d4aaf36 /arch/mips/kernel
parent76b021d053ed0b8de9689eefca5e8f53dade7fd7 (diff)
consolidate compat lookup_dcookie()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r--arch/mips/kernel/linux32.c6
-rw-r--r--arch/mips/kernel/scall64-o32.S2
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index b0cc2a7df59f..6852d4876f82 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -259,12 +259,6 @@ asmlinkage long sys32_fallocate(int fd, int mode, unsigned offset_a2,
259 merge_64(len_a4, len_a5)); 259 merge_64(len_a4, len_a5));
260} 260}
261 261
262asmlinkage long sys32_lookup_dcookie(u32 a0, u32 a1, char __user *buf,
263 size_t len)
264{
265 return sys_lookup_dcookie(merge_64(a0, a1), buf, len);
266}
267
268SYSCALL_DEFINE6(32_fanotify_mark, int, fanotify_fd, unsigned int, flags, 262SYSCALL_DEFINE6(32_fanotify_mark, int, fanotify_fd, unsigned int, flags,
269 u64, a3, u64, a4, int, dfd, const char __user *, pathname) 263 u64, a3, u64, a4, int, dfd, const char __user *, pathname)
270{ 264{
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index c1a70e805751..91c8c6ea7b09 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -439,7 +439,7 @@ sys_call_table:
439 PTR compat_sys_io_submit 439 PTR compat_sys_io_submit
440 PTR sys_io_cancel /* 4245 */ 440 PTR sys_io_cancel /* 4245 */
441 PTR sys_exit_group 441 PTR sys_exit_group
442 PTR sys32_lookup_dcookie 442 PTR compat_sys_lookup_dcookie
443 PTR sys_epoll_create 443 PTR sys_epoll_create
444 PTR sys_epoll_ctl 444 PTR sys_epoll_ctl
445 PTR sys_epoll_wait /* 4250 */ 445 PTR sys_epoll_wait /* 4250 */