From de32e04175efbc1ff5e0f509253d5dfc84f173b3 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 11 Jul 2007 12:18:30 -0700 Subject: 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 Signed-off-by: Linus Torvalds --- arch/i386/kernel/verify_cpu.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/i386/kernel') diff --git a/arch/i386/kernel/verify_cpu.S b/arch/i386/kernel/verify_cpu.S index 3efc5c137d1..fff4aa61d7c 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 -- cgit v1.2.3