mips: remove syscall table entries

The config flag - CONFIG_MIPS_MT_FPAFF uses to check whether which
syscall entries need to be used in scall32-o32.S file.

One of the patch in this patch series will generate syscall table
file. But CONFIG_MIPS_MT_FPAFF flag will add more complexity in the
script to generate the syscall table file.

In order to come up with a common implementation across all archit-
ecture, we need to remove mipsmt_sys_sched_setaffinity and mipsmt-
_sys_sched_getaffinity from the table and define it in other way.

Signed-off-by: Firoz Khan <firoz.khan@linaro.org>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: y2038@lists.linaro.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: arnd@arndb.de
Cc: deepa.kernel@gmail.com
Cc: marcin.juszkiewicz@linaro.org

diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 10f636765728458e5785baa0a4af78584d445d4e..43fa5cd9d8a269ed0542f70e13d449f3a9430feb 100644 (file)
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -205,6 +205,18 @@ einval: li v0, -ENOSYS
        jr      ra
        END(sys_syscall)
 
+#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/core.c.  Considered only temporary we only support
+        * these hooks for the 32-bit kernel - there is no MIPS64 MT processor
+        * atm.
+        */
+#define sys_sched_setaffinity  mipsmt_sys_sched_setaffinity
+#define sys_sched_getaffinity  mipsmt_sys_sched_getaffinity
+#endif /* CONFIG_MIPS_MT_FPAFF */
+
        .align  2
        .type   sys_call_table, @object
 EXPORT(sys_call_table)
@@ -447,20 +459,8 @@ EXPORT(sys_call_table)
        PTR     sys_tkill
        PTR     sys_sendfile64
        PTR     sys_futex
-#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/core.c.  Considered only temporary we only support
-        * these hooks for the 32-bit kernel - there is no MIPS64 MT processor
-        * atm.
-        */
-       PTR     mipsmt_sys_sched_setaffinity
-       PTR     mipsmt_sys_sched_getaffinity
-#else
        PTR     sys_sched_setaffinity
        PTR     sys_sched_getaffinity           /* 4240 */
-#endif /* CONFIG_MIPS_MT_FPAFF */
        PTR     sys_io_setup
        PTR     sys_io_destroy
        PTR     sys_io_getevents