[PATCH] x86: Disable HIGHMEM64G selection for M486SX

[PATCH] x86: Disable HIGHMEM64G selection for M486SX

[Maciej W. Rozycki]

Fix a regression caused by making the 486SX a separate processor family, 
for which the HIGHMEM64G setting has not been updated and therefore has 
become exposed as a user selectable option for the M486SX configuration 
setting unlike with original M486 and all the other settings that choose 
non-PAE-enabled processors:

High Memory Support
> 1. off (NOHIGHMEM)
  2. 4GB (HIGHMEM4G)
  3. 64GB (HIGHMEM64G)
choice[1-3?]:

With the fix in place the setting is now correctly removed:

High Memory Support
> 1. off (NOHIGHMEM)
  2. 4GB (HIGHMEM4G)
choice[1-2?]:

Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk>
Fixes: 87d6021b8143 ("x86/math-emu: Limit MATH_EMULATION to 486SX compatibles")
Cc: stable@vger.kernel.org # v5.5+
---
 arch/x86/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

linux-x86-highmem64g-m486sx.diff
Index: linux-macro-ide/arch/x86/Kconfig
===================================================================
--- linux-macro-ide.orig/arch/x86/Kconfig
+++ linux-macro-ide/arch/x86/Kconfig
@@ -1406,7 +1406,7 @@ config HIGHMEM4G
 
 config HIGHMEM64G
 	bool "64GB"
-	depends on !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6
+	depends on !M486SX && !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6
 	select X86_PAE
 	help
 	  Select this if you have a 32-bit processor and more than 4

[tip: x86/build] x86/build: Disable HIGHMEM64G selection for M486SX

[tip-bot2 for Maciej W. Rozycki]

The following commit has been merged into the x86/build branch of tip:

Commit-ID:     0ef3439cd80ba7770723edb0470d15815914bb62
Gitweb:        https://git.kernel.org/tip/0ef3439cd80ba7770723edb0470d15815914bb62
Author:        Maciej W. Rozycki <macro@orcam.me.uk>
AuthorDate:    Wed, 14 Apr 2021 12:38:28 +02:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 19 Apr 2021 14:02:12 +02:00

x86/build: Disable HIGHMEM64G selection for M486SX

Fix a regression caused by making the 486SX separately selectable in
Kconfig, for which the HIGHMEM64G setting has not been updated and
therefore has become exposed as a user-selectable option for the M486SX
configuration setting unlike with original M486 and all the other
settings that choose non-PAE-enabled processors:

  High Memory Support
  > 1. off (NOHIGHMEM)
    2. 4GB (HIGHMEM4G)
    3. 64GB (HIGHMEM64G)
  choice[1-3?]:

With the fix in place the setting is now correctly removed:

  High Memory Support
  > 1. off (NOHIGHMEM)
    2. 4GB (HIGHMEM4G)
  choice[1-2?]:

 [ bp: Massage commit message. ]

Fixes: 87d6021b8143 ("x86/math-emu: Limit MATH_EMULATION to 486SX compatibles")
Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: stable@vger.kernel.org # v5.5+
Link: https://lkml.kernel.org/r/alpine.DEB.2.21.2104141221340.44318@angie.orcam.me.uk
---
 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 2792879..268b7d5 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1406,7 +1406,7 @@ config HIGHMEM4G
 
 config HIGHMEM64G
 	bool "64GB"
-	depends on !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6
+	depends on !M486SX && !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6
 	select X86_PAE
 	help
 	  Select this if you have a 32-bit processor and more than 4