Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[mirror_ubuntu-artful-kernel.git] / arch / mips / kernel / scall64-o32.S

diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index b0fef4ff9827610210ef3dc16d903d347491169d..a5598b2339dd451a4586d3dde4b30050a48c5290 100644 (file)
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -265,7 +265,7 @@ sys_call_table:
        PTR     sys_olduname
        PTR     sys_umask                       /* 4060 */
        PTR     sys_chroot
-       PTR     sys_32_ustat
+       PTR     compat_sys_ustat
        PTR     sys_dup2
        PTR     sys_getppid
        PTR     sys_getpgrp                     /* 4065 */
@@ -525,12 +525,14 @@ sys_call_table:
        PTR     sys_eventfd
        PTR     sys32_fallocate                 /* 4320 */
        PTR     sys_timerfd_create
-       PTR     sys_timerfd_gettime
-       PTR     sys_timerfd_settime
+       PTR     compat_sys_timerfd_gettime
+       PTR     compat_sys_timerfd_settime
        PTR     compat_sys_signalfd4
        PTR     sys_eventfd2                    /* 4325 */
        PTR     sys_epoll_create1
        PTR     sys_dup3
        PTR     sys_pipe2
        PTR     sys_inotify_init1
+       PTR     compat_sys_preadv               /* 4330 */
+       PTR     compat_sys_pwritev
        .size   sys_call_table,.-sys_call_table