Remove unsupported forcing of `cpu_has_fpu' to 1, which makes the `nofpu' kernel parameter non-functional, and also causes a link error:
ld: arch/mips/kernel/traps.o: in function `trap_init': ./arch/mips/include/asm/msa.h:(.init.text+0x348): undefined reference to `handle_fpe' ld: ./arch/mips/include/asm/msa.h:(.init.text+0x354): undefined reference to `handle_fpe' ld: ./arch/mips/include/asm/msa.h:(.init.text+0x360): undefined reference to `handle_fpe'
where the CONFIG_MIPS_FP_SUPPORT configuration option has been disabled.
Signed-off-by: Maciej W. Rozycki macro@orcam.me.uk Reported-by: Stephen Zhang starzhangzsd@gmail.com Fixes: 7505576d1c1a ("MIPS: add support for SGI Octane (IP30)") Cc: stable@vger.kernel.org # v5.5+ --- Hi,
This is a version of commit f44b3e74c33f for 5.17-stable and before (where the preceding `#define cpu_has_tx39_cache 0' line has not been removed yet and hence the merge conflict).
No functional change, just a mechanical update. Please apply.
Maciej --- arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h | 1 - 1 file changed, 1 deletion(-)
linux-mips-ip30-cpu-has-fpu.diff Index: linux-macro/arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h =================================================================== --- linux-macro.orig/arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h +++ linux-macro/arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h @@ -29,7 +29,6 @@ #define cpu_has_3k_cache 0 #define cpu_has_4k_cache 1 #define cpu_has_tx39_cache 0 -#define cpu_has_fpu 1 #define cpu_has_nofpuex 0 #define cpu_has_32fpr 1 #define cpu_has_counter 1