From: Greg Kroah-Hartman Date: Mon, 11 Oct 2021 12:21:23 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.14.12~7 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4687092026ea542d0b139895e5d2edb3516da978;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: x86-kconfig-correct-reference-to-mwinchip3d.patch --- diff --git a/queue-5.4/series b/queue-5.4/series index f500009eba5..3f849faf025 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -49,3 +49,4 @@ risc-v-include-clone3-on-rv32.patch powerpc-bpf-fix-bpf_mod-when-imm-1.patch x86-platform-olpc-correct-ifdef-symbol-to-intended-config_olpc_xo15_sci.patch x86-hpet-use-another-crystalball-to-evaluate-hpet-usability.patch +x86-kconfig-correct-reference-to-mwinchip3d.patch diff --git a/queue-5.4/x86-kconfig-correct-reference-to-mwinchip3d.patch b/queue-5.4/x86-kconfig-correct-reference-to-mwinchip3d.patch new file mode 100644 index 00000000000..741577055ae --- /dev/null +++ b/queue-5.4/x86-kconfig-correct-reference-to-mwinchip3d.patch @@ -0,0 +1,43 @@ +From 225bac2dc5d192e55f2c50123ee539b1edf8a411 Mon Sep 17 00:00:00 2001 +From: Lukas Bulwahn +Date: Tue, 3 Aug 2021 13:35:25 +0200 +Subject: x86/Kconfig: Correct reference to MWINCHIP3D + +From: Lukas Bulwahn + +commit 225bac2dc5d192e55f2c50123ee539b1edf8a411 upstream. + +Commit in Fixes intended to exclude the Winchip series and referred to +CONFIG_WINCHIP3D, but the config symbol is called CONFIG_MWINCHIP3D. + +Hence, scripts/checkkconfigsymbols.py warns: + +WINCHIP3D +Referencing files: arch/x86/Kconfig + +Correct the reference to the intended config symbol. + +Fixes: 69b8d3fcabdc ("x86/Kconfig: Exclude i586-class CPUs lacking PAE support from the HIGHMEM64G Kconfig group") +Suggested-by: Randy Dunlap +Signed-off-by: Lukas Bulwahn +Signed-off-by: Borislav Petkov +Cc: +Link: https://lkml.kernel.org/r/20210803113531.30720-4-lukas.bulwahn@gmail.com +[manually adjusted the change to the state on the v4.19.y and v5.4.y stable tree] +Signed-off-by: Lukas Bulwahn +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -1425,7 +1425,7 @@ config HIGHMEM4G + + config HIGHMEM64G + bool "64GB" +- depends on !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6 ++ depends on !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !MWINCHIP3D && !MK6 + select X86_PAE + ---help--- + Select this if you have a 32-bit processor and more than 4