Skip to content

Commit

Permalink
x86 Kconfig: change X86_MINIMUM_CPU_MODEL to X86_MINIMUM_CPU_FAMILY
Browse files Browse the repository at this point in the history
The X86_MINIMUM_CPU_MODEL name isn't really right, so change it to
X86_MINIMUM_CPU_FAMILY.  Also, the default minimum should be 3, not 0.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
H. Peter Anvin authored and Linus Torvalds committed Jul 12, 2007
1 parent ec48153 commit de32e04
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions arch/i386/Kconfig.cpu
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,8 @@ config X86_CMOV
depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7)
default y

config X86_MINIMUM_CPU_MODEL
config X86_MINIMUM_CPU_FAMILY
int
default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP
default "0"
default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK
default "3"

4 changes: 2 additions & 2 deletions arch/i386/kernel/verify_cpu.S
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ verify_cpu:
pushl $0 # Kill any dangerous flags
popfl

#if CONFIG_X86_MINIMUM_CPU_MODEL >= 4
#if CONFIG_X86_MINIMUM_CPU_FAMILY >= 4
pushfl
pop %eax
orl $(1<<18),%eax # try setting AC
Expand Down Expand Up @@ -75,7 +75,7 @@ verify_cpu:
movl $0x1,%eax # Does the cpu have what it takes
cpuid

#if CONFIG_X86_MINIMUM_CPU_MODEL > 4
#if CONFIG_X86_MINIMUM_CPU_FAMILY > 4
#error add proper model checking here
#endif

Expand Down

0 comments on commit de32e04

Please sign in to comment.