Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-3
+1
-1
arch/x86/Kconfig
+1
-1
arch/x86/Kconfig
···
1404
1404
1405
1405
config HIGHMEM64G
1406
1406
bool "64GB"
1407
-
depends on !M486
1407
+
depends on !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6
1408
1408
select X86_PAE
1409
1409
---help---
1410
1410
Select this if you have a 32-bit processor and more than 4
+2
-2
arch/x86/Kconfig.cpu
+2
-2
arch/x86/Kconfig.cpu
···
374
374
375
375
config X86_CMPXCHG64
376
376
def_bool y
377
-
depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM
377
+
depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586TSC || M586MMX || MATOM || MGEODE_LX || MGEODEGX1 || MK6 || MK7 || MK8
378
378
379
379
# this should be set for all -march=.. options where the compiler
380
380
# generates cmov.
···
385
385
config X86_MINIMUM_CPU_FAMILY
386
386
int
387
387
default "64" if X86_64
388
-
default "6" if X86_32 && X86_P6_NOP
388
+
default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCRUSOE || MCORE2 || MK7 || MK8)
389
389
default "5" if X86_32 && X86_CMPXCHG64
390
390
default "4"
391
391