Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

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

diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 942aca2..67b92a1 100644 (file)
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -7,10 +7,10 @@
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  * Copyright (C) 2001 MIPS Technologies, Inc.
  */
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <asm/asm.h>
 #include <asm/asmmacro.h>
+#include <asm/irqflags.h>
 #include <asm/mipsregs.h>
 #include <asm/regdef.h>
 #include <asm/stackframe.h>
@@ -33,6 +33,7 @@ NESTED(handle_sysn32, PT_SIZE, sp)
 #ifndef CONFIG_MIPS32_O32
        .set    noat
        SAVE_SOME
+       TRACE_IRQS_ON_RELOAD
        STI
        .set    at
 #endif
@@ -246,7 +247,7 @@ EXPORT(sysn32_call_table)
        PTR     sys_capset
        PTR     sys32_rt_sigpending             /* 6125 */
        PTR     compat_sys_rt_sigtimedwait
-       PTR     sys_rt_sigqueueinfo
+       PTR     sys32_rt_sigqueueinfo
        PTR     sysn32_rt_sigsuspend
        PTR     sys32_sigaltstack
        PTR     compat_sys_utime                /* 6130 */
@@ -279,7 +280,7 @@ EXPORT(sysn32_call_table)
        PTR     sys_sync
        PTR     sys_acct
        PTR     sys32_settimeofday
-       PTR     sys_mount                       /* 6160 */
+       PTR     compat_sys_mount                /* 6160 */
        PTR     sys_umount
        PTR     sys_swapon
        PTR     sys_swapoff
@@ -388,3 +389,9 @@ EXPORT(sysn32_call_table)
        PTR     sys_unshare
        PTR     sys_splice
        PTR     sys_sync_file_range
+       PTR     sys_tee
+       PTR     sys_vmsplice                    /* 6270 */
+       PTR     sys_move_pages
+       PTR     compat_sys_set_robust_list
+       PTR     compat_sys_get_robust_list
+       PTR     sys_ni_syscall