diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-27 09:46:24 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-27 09:46:24 -0800 |
commit | de5f503cfbe4f942492269c6bd97a16a4d61e488 (patch) | |
tree | 680d9c6624c9cad72e4654dd6c986f6ea4df21ac /arch/mips/kernel/scall64-o32.S | |
parent | d904ffd6e0c3ab7631b07c21c9f9234a2e72d1f3 (diff) | |
parent | 2fd628fe25e1f3d07996b0dab728ea0702f81306 (diff) | |
download | blackbird-op-linux-de5f503cfbe4f942492269c6bd97a16a4d61e488.tar.gz blackbird-op-linux-de5f503cfbe4f942492269c6bd97a16a4d61e488.zip |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/kernel/scall64-o32.S')
-rw-r--r-- | arch/mips/kernel/scall64-o32.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 5b0414018c9a..797e0d874889 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S @@ -293,7 +293,7 @@ sys_call_table: PTR sys_uselib PTR sys_swapon PTR sys_reboot - PTR sys32_readdir + PTR compat_sys_old_readdir PTR old_mmap /* 4090 */ PTR sys_munmap PTR sys_truncate @@ -345,7 +345,7 @@ sys_call_table: PTR sys_setfsuid PTR sys_setfsgid PTR sys32_llseek /* 4140 */ - PTR sys32_getdents + PTR compat_sys_getdents PTR compat_sys_select PTR sys_flock PTR sys_msync |