Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings
forked fromtorvalds/linux

Commit0e06fb5

Browse files
committed
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
2 parents9ca2c16 +25d76ac commit0e06fb5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

‎arch/x86/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,7 @@ config HIGHMEM4G
14041404

14051405
config HIGHMEM64G
14061406
bool "64GB"
1407-
depends on !M486
1407+
depends on !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6
14081408
select X86_PAE
14091409
---help---
14101410
Select this if you have a 32-bit processor and more than 4

‎arch/x86/Kconfig.cpu‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ config X86_TSC
374374

375375
config X86_CMPXCHG64
376376
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
378378

379379
# this should be set for all -march=.. options where the compiler
380380
# generates cmov.
@@ -385,7 +385,7 @@ config X86_CMOV
385385
config X86_MINIMUM_CPU_FAMILY
386386
int
387387
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)
389389
default "5" if X86_32 && X86_CMPXCHG64
390390
default "4"
391391

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp