diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-07-11 15:18:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 13:55:54 -0400 |
| commit | de32e04175efbc1ff5e0f509253d5dfc84f173b3 (patch) | |
| tree | f6cad93a71f3bbd15b072c959f6e33126ac85db0 /arch/i386/kernel | |
| parent | ec481536b15eb0520d8f0204b0294480050fe1f8 (diff) | |
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>
Diffstat (limited to 'arch/i386/kernel')
| -rw-r--r-- | arch/i386/kernel/verify_cpu.S | 4 |
1 files changed, 2 insertions, 2 deletions
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: | |||
| 9 | pushl $0 # Kill any dangerous flags | 9 | pushl $0 # Kill any dangerous flags |
| 10 | popfl | 10 | popfl |
| 11 | 11 | ||
| 12 | #if CONFIG_X86_MINIMUM_CPU_MODEL >= 4 | 12 | #if CONFIG_X86_MINIMUM_CPU_FAMILY >= 4 |
| 13 | pushfl | 13 | pushfl |
| 14 | pop %eax | 14 | pop %eax |
| 15 | orl $(1<<18),%eax # try setting AC | 15 | orl $(1<<18),%eax # try setting AC |
| @@ -75,7 +75,7 @@ verify_cpu: | |||
| 75 | movl $0x1,%eax # Does the cpu have what it takes | 75 | movl $0x1,%eax # Does the cpu have what it takes |
| 76 | cpuid | 76 | cpuid |
| 77 | 77 | ||
| 78 | #if CONFIG_X86_MINIMUM_CPU_MODEL > 4 | 78 | #if CONFIG_X86_MINIMUM_CPU_FAMILY > 4 |
| 79 | #error add proper model checking here | 79 | #error add proper model checking here |
| 80 | #endif | 80 | #endif |
| 81 | 81 | ||