[x86 setup 05/33] Change CONFIG_X86_MINIMUM_CPU_MODEL to CONFIG_X86_MINIMUM_CPU_FAMILY
From: H. Peter Anvin
Date: Mon Jul 09 2007 - 23:08:04 EST
From: H. Peter Anvin <hpa@xxxxxxxxx>
CONFIG_X86_MINIMUM_CPU_MODEL, so change it to
CONFIG_X86_MINIMUM_CPU_FAMILY. Also, the default minimum should be
3, not 0.
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
---
arch/i386/Kconfig.cpu | 6 +++---
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 5c95ceb..9cbe76c 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 3efc5c1..fff4aa6 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
--
1.5.2.2
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/