MIPS: Hardcode cpu_has_fpu=0 when CONFIG_MIPS_FP_SUPPORT=n

When CONFIG_MIPS_FP_SUPPORT=n we don't support floating point, so
there's no point in detecting presence of an FPU. Hardcode
cpu_has_fpu=0 such that we optimize out code that makes use of the FPU.

Signed-off-by: Paul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/21005/
Cc: linux-mips@linux-mips.org

diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h
index 8669fdb503a55cea77f2be58a9a76cf6bab66b10..450e0638f22dbeea94898189cc06ff4a7e713521 100644 (file)
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -115,10 +115,15 @@
 #endif
 /* Don't override `cpu_has_fpu' to 1 or the "nofpu" option won't work.  */
 #ifndef cpu_has_fpu
-#define cpu_has_fpu            (current_cpu_data.options & MIPS_CPU_FPU)
-#define raw_cpu_has_fpu                (raw_current_cpu_data.options & MIPS_CPU_FPU)
+# ifdef CONFIG_MIPS_FP_SUPPORT
+#  define cpu_has_fpu          (current_cpu_data.options & MIPS_CPU_FPU)
+#  define raw_cpu_has_fpu      (raw_current_cpu_data.options & MIPS_CPU_FPU)
+# else
+#  define cpu_has_fpu          0
+#  define raw_cpu_has_fpu      0
+# endif
 #else
-#define raw_cpu_has_fpu                cpu_has_fpu
+# define raw_cpu_has_fpu       cpu_has_fpu
 #endif
 #ifndef cpu_has_32fpr
 #define cpu_has_32fpr          __isa_ge_or_opt(1, MIPS_CPU_32FPR)