Commit 0e06fb5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 Kconfig fixes from Thomas Gleixner:
 "Three patchlets to correct HIGHMEM64G and CMPXCHG64 dependencies in
  Kconfig when CPU selections are explicitely set to M586 or M686"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/Kconfig: Explicitly enumerate i686-class CPUs in Kconfig
  x86/Kconfig: Exclude i586-class CPUs lacking PAE support from the HIGHMEM64G Kconfig group
  x86/Kconfig: Add missing i586-class CPUs to the X86_CMPXCHG64 Kconfig group
parents 9ca2c16f 25d76ac8

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ config HIGHMEM4G 


config HIGHMEM64G

	bool "64GB"

	depends on !M486

	depends on !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

arch/x86/Kconfig.cpu

+2 −2
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ config X86_TSC 


config X86_CMPXCHG64

	def_bool y

	depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM

	depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586TSC || M586MMX || MATOM || MGEODE_LX || MGEODEGX1 || MK6 || MK7 || MK8



# this should be set for all -march=.. options where the compiler

# generates cmov.
@@ -385,7 +385,7 @@ config X86_CMOV 
config X86_MINIMUM_CPU_FAMILY

	int

	default "64" if X86_64

	default "6" if X86_32 && X86_P6_NOP

	default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCRUSOE || MCORE2 || MK7 || MK8)

	default "5" if X86_32 && X86_CMPXCHG64

	default "4"

CRA Git | Maintained and supported by SUSTech CRA and CCSE