Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[cascardo/linux.git] / arch / mips / kernel / scall64-n32.S

diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index c3b3b65..ebc9228 100644 (file)
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -162,7 +162,7 @@ EXPORT(sysn32_call_table)
        PTR     sys_getpeername
        PTR     sys_socketpair
        PTR     compat_sys_setsockopt
-       PTR     sys_getsockopt
+       PTR     compat_sys_getsockopt
        PTR     __sys_clone                     /* 6055 */
        PTR     __sys_fork
        PTR     compat_sys_execve
@@ -339,9 +339,9 @@ EXPORT(sysn32_call_table)
        PTR     compat_sys_clock_nanosleep
        PTR     sys_tgkill
        PTR     compat_sys_utimes               /* 6230 */
-       PTR     sys_ni_syscall                  /* sys_mbind */
-       PTR     sys_ni_syscall                  /* sys_get_mempolicy */
-       PTR     sys_ni_syscall                  /* sys_set_mempolicy */
+       PTR     compat_sys_mbind
+       PTR     compat_sys_get_mempolicy
+       PTR     compat_sys_set_mempolicy
        PTR     compat_sys_mq_open
        PTR     sys_mq_unlink                   /* 6235 */
        PTR     compat_sys_mq_timedsend
@@ -358,7 +358,7 @@ EXPORT(sysn32_call_table)
        PTR     sys_inotify_init
        PTR     sys_inotify_add_watch
        PTR     sys_inotify_rm_watch
-       PTR     sys_migrate_pages               /* 6250 */
+       PTR     compat_sys_migrate_pages        /* 6250 */
        PTR     sys_openat
        PTR     sys_mkdirat
        PTR     sys_mknodat
@@ -379,7 +379,7 @@ EXPORT(sysn32_call_table)
        PTR     sys_sync_file_range
        PTR     sys_tee
        PTR     compat_sys_vmsplice             /* 6270 */
-       PTR     sys_move_pages
+       PTR     compat_sys_move_pages
        PTR     compat_sys_set_robust_list
        PTR     compat_sys_get_robust_list
        PTR     compat_sys_kexec_load