aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/scall64-o32.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-20 13:18:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-20 13:18:21 -0700
commit7d7c4d06be246b249f0f7e0b7df2f73d09cc6376 (patch)
tree7c7d3314b7bea5fe932eb76d80d9a102ffcda204 /arch/mips/kernel/scall64-o32.S
parent531295e63be8c2b8b909d7400739e8b8df60d61f (diff)
parente2cc502c3f71d8de812893527dc435e61b7fe604 (diff)
downloadkernel_samsung_smdk4412-7d7c4d06be246b249f0f7e0b7df2f73d09cc6376.zip
kernel_samsung_smdk4412-7d7c4d06be246b249f0f7e0b7df2f73d09cc6376.tar.gz
kernel_samsung_smdk4412-7d7c4d06be246b249f0f7e0b7df2f73d09cc6376.tar.bz2
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls. MAINTAINERS: Change list for ioc_serial to linux-serial. SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure MIPS: jz4740: Fix Kbuild Platform file. MIPS: Repair Kbuild make clean breakage.
Diffstat (limited to 'arch/mips/kernel/scall64-o32.S')
-rw-r--r--arch/mips/kernel/scall64-o32.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 42fe14b..78d768a 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -445,10 +445,10 @@ sys_call_table:
PTR compat_sys_futex
PTR compat_sys_sched_setaffinity
PTR compat_sys_sched_getaffinity /* 4240 */
- PTR sys_io_setup
+ PTR compat_sys_io_setup
PTR sys_io_destroy
- PTR sys_io_getevents
- PTR sys_io_submit
+ PTR compat_sys_io_getevents
+ PTR compat_sys_io_submit
PTR sys_io_cancel /* 4245 */
PTR sys_exit_group
PTR sys32_lookup_dcookie