diff options
| author |   Wu Zhangjin <wuzhangjin@gmail.com> | 2009-10-10 19:19:49 +0800 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2009-11-02 12:00:02 +0100 |
| commit | 80b8585b07feede94a742c4cdb80ab607a8813b3 (patch) | |
| tree | bce54a378a08e8fec975e024ca8b598a14343903 | |
| parent | MIPS: VPE: Remove stray unlock_kernel. (diff) | |
| download | linux-dev-80b8585b07feede94a742c4cdb80ab607a8813b3.tar.xz linux-dev-80b8585b07feede94a742c4cdb80ab607a8813b3.zip | |
MIPS: 64-bit: Fix o32 lookup_dcookie syscall
An o32 aplication passes a 64-bit value in a pair of registers; a 64-bit
kernel expects a 64-bit argument in a single register.
Signed-off-by: Chen Jie <chenj@lemote.com>
Signed-off-by: Hu Hongbing <huhb@lemote.com>
Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/kernel/linux32.c | 6 | ||||
| -rw-r--r-- | arch/mips/kernel/scall64-o32.S | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 6242bc68add7..b77fefaff9da 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c @@ -428,3 +428,9 @@ _sys32_clone(nabi_no_regargs struct pt_regs regs) return do_fork(clone_flags, newsp, ®s, 0, parent_tidptr, child_tidptr); } + +asmlinkage long sys32_lookup_dcookie(u32 a0, u32 a1, char __user *buf, + size_t len) +{ + return sys_lookup_dcookie(merge_64(a0, a1), buf, len); +} diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 9bbf9775e0bd..ba0dde6465a5 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S @@ -450,7 +450,7 @@ sys_call_table: PTR sys_io_submit PTR sys_io_cancel /* 4245 */ PTR sys_exit_group - PTR sys_lookup_dcookie + PTR sys32_lookup_dcookie PTR sys_epoll_create PTR sys_epoll_ctl PTR sys_epoll_wait /* 4250 */ |