diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-20 16:18:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-20 16:18:21 -0400 |
| commit | 7d7c4d06be246b249f0f7e0b7df2f73d09cc6376 (patch) | |
| tree | 7c7d3314b7bea5fe932eb76d80d9a102ffcda204 /arch/mips/kernel/scall64-n32.S | |
| parent | 531295e63be8c2b8b909d7400739e8b8df60d61f (diff) | |
| parent | e2cc502c3f71d8de812893527dc435e61b7fe604 (diff) | |
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-n32.S')
| -rw-r--r-- | arch/mips/kernel/scall64-n32.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 38b226938db..f08ece6d8ac 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -322,10 +322,10 @@ EXPORT(sysn32_call_table) | |||
| 322 | PTR sys_cacheflush | 322 | PTR sys_cacheflush |
| 323 | PTR sys_cachectl | 323 | PTR sys_cachectl |
| 324 | PTR sys_sysmips | 324 | PTR sys_sysmips |
| 325 | PTR sys_io_setup /* 6200 */ | 325 | PTR compat_sys_io_setup /* 6200 */ |
| 326 | PTR sys_io_destroy | 326 | PTR sys_io_destroy |
| 327 | PTR sys_io_getevents | 327 | PTR compat_sys_io_getevents |
| 328 | PTR sys_io_submit | 328 | PTR compat_sys_io_submit |
| 329 | PTR sys_io_cancel | 329 | PTR sys_io_cancel |
| 330 | PTR sys_exit_group /* 6205 */ | 330 | PTR sys_exit_group /* 6205 */ |
| 331 | PTR sys_lookup_dcookie | 331 | PTR sys_lookup_dcookie |