From: Greg Kroah-Hartman Date: Tue, 7 Jun 2022 09:56:36 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.10.121~31 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a197116c8ee252171b4ae41b67f01d63d923590;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: mips-ip27-remove-incorrect-cpu_has_fpu-override.patch --- diff --git a/queue-5.4/mips-ip27-remove-incorrect-cpu_has_fpu-override.patch b/queue-5.4/mips-ip27-remove-incorrect-cpu_has_fpu-override.patch new file mode 100644 index 00000000000..8aec3f73143 --- /dev/null +++ b/queue-5.4/mips-ip27-remove-incorrect-cpu_has_fpu-override.patch @@ -0,0 +1,39 @@ +From 424c3781dd1cb401857585331eaaa425a13f2429 Mon Sep 17 00:00:00 2001 +From: "Maciej W. Rozycki" +Date: Sun, 1 May 2022 23:14:16 +0100 +Subject: MIPS: IP27: Remove incorrect `cpu_has_fpu' override + +From: Maciej W. Rozycki + +commit 424c3781dd1cb401857585331eaaa425a13f2429 upstream. + +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 +Reported-by: Stephen Zhang +Fixes: 0ebb2f4159af ("MIPS: IP27: Update/restructure CPU overrides") +Cc: stable@vger.kernel.org # v4.2+ +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h | 1 - + 1 file changed, 1 deletion(-) + +--- a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h ++++ b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h +@@ -28,7 +28,6 @@ + #define cpu_has_6k_cache 0 + #define cpu_has_8k_cache 0 + #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 diff --git a/queue-5.4/series b/queue-5.4/series index 6158516d37b..a5cd7afa5d2 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -271,3 +271,4 @@ blk-iolatency-fix-inflight-count-imbalances-and-io-hangs-on-offline.patch phy-qcom-qmp-fix-reset-controller-leak-on-probe-errors.patch kconfig-add-config-option-for-asm-goto-w-outputs.patch rdma-rxe-generate-a-completion-for-unsupported-invalid-opcode.patch +mips-ip27-remove-incorrect-cpu_has_fpu-override.patch