| From 225bac2dc5d192e55f2c50123ee539b1edf8a411 Mon Sep 17 00:00:00 2001 |
| From: Lukas Bulwahn <lukas.bulwahn@gmail.com> |
| Date: Tue, 3 Aug 2021 13:35:25 +0200 |
| Subject: x86/Kconfig: Correct reference to MWINCHIP3D |
| |
| From: Lukas Bulwahn <lukas.bulwahn@gmail.com> |
| |
| 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 <rdunlap@infradead.org> |
| Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> |
| Signed-off-by: Borislav Petkov <bp@suse.de> |
| Cc: <stable@vger.kernel.org> |
| 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 <lukas.bulwahn@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/x86/Kconfig | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/x86/Kconfig |
| +++ b/arch/x86/Kconfig |
| @@ -1387,7 +1387,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 |
