Merge branch 'master'

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 2f2dc54b2e26..a0ac0e5f61ad 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -569,8 +569,19 @@ einval:	li	v0, -EINVAL
         sys     sys_tkill               2
         sys     sys_sendfile64          5
         sys     sys_futex               6
+#ifdef CONFIG_MIPS_MT_FPAFF
+        /*
+         * For FPU affinity scheduling on MIPS MT processors, we need to
+         * intercept sys_sched_xxxaffinity() calls until we get a proper hook
+         * in kernel/sched.c.  Considered only temporary we only support these
+         * hooks for the 32-bit kernel - there is no MIPS64 MT processor atm.
+         */
+        sys     mipsmt_sys_sched_setaffinity    3
+        sys     mipsmt_sys_sched_getaffinity    3
+#else
         sys     sys_sched_setaffinity   3
         sys     sys_sched_getaffinity   3       /* 4240 */
+#endif /* CONFIG_MIPS_MT_FPAFF */
         sys     sys_io_setup            2
         sys     sys_io_destroy          1
         sys     sys_io_getevents        5
@@ -634,6 +645,8 @@ einval:	li	v0, -EINVAL
         sys     sys_pselect6            6
         sys     sys_ppoll               5
         sys     sys_unshare             1
+        sys     sys_splice              4
+        sys     sys_sync_file_range     7       /* 4305 */
         .endm
 
         /* We pre-compute the number of _instruction_ bytes needed to