diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-07-11 21:18:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 19:55:54 +0200 |
| commit | de32e04175efbc1ff5e0f509253d5dfc84f173b3 (patch) | |
| tree | f6cad93a71f3bbd15b072c959f6e33126ac85db0 | |
| parent | Unify the CPU features vectors between i386 and x86-64 (diff) | |
| download | linux-de32e04175efbc1ff5e0f509253d5dfc84f173b3.tar.xz linux-de32e04175efbc1ff5e0f509253d5dfc84f173b3.zip | |
x86 Kconfig: change X86_MINIMUM_CPU_MODEL to X86_MINIMUM_CPU_FAMILY
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>
| -rw-r--r-- | arch/i386/Kconfig.cpu | 6 | ||||
| -rw-r--r-- | arch/i386/kernel/verify_cpu.S | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu index 5c95ceb7f122..9cbe76c3aa35 100644 --- a/arch/i386/Kconfig.cpu +++ b/arch/i386/Kconfig.cpu @@ -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" diff --git a/arch/i386/kernel/verify_cpu.S b/arch/i386/kernel/verify_cpu.S index 3efc5c137d14..fff4aa61d7c3 100644 --- a/arch/i386/kernel/verify_cpu.S +++ b/arch/i386/kernel/verify_cpu.S @@ -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 @@ -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 |