diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2007-11-06 15:35:08 -0500 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2007-11-12 15:02:19 -0500 |
commit | 1032c0ba9da5c5b53173ad2dcf8b2a2da78f8b17 (patch) | |
tree | 3477a72cf0a0c0a04540826b54e12afe45eb8ac6 /arch/x86/boot | |
parent | e279b6c1d329e50b766bce96aacc197eae8a053b (diff) |
x86: arch/x86/Kconfig.cpu unification
Move all CPU definitions to Kconfig.cpu
Always define X86_MINIMUM_CPU_FAMILY and do the
obvious code cleanup in boot/cpucheck.c
Comments from: Adrian Bunk <bunk@kernel.org> incorporated.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Adrian Bunk <bunk@kernel.org>
Cc: Brian Gerst <bgerst@didntduck.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r-- | arch/x86/boot/cpucheck.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c index e655a89c5510..769065bd23d7 100644 --- a/arch/x86/boot/cpucheck.c +++ b/arch/x86/boot/cpucheck.c | |||
@@ -42,13 +42,7 @@ static struct cpu_features cpu; | |||
42 | static u32 cpu_vendor[3]; | 42 | static u32 cpu_vendor[3]; |
43 | static u32 err_flags[NCAPINTS]; | 43 | static u32 err_flags[NCAPINTS]; |
44 | 44 | ||
45 | #ifdef CONFIG_X86_64 | ||
46 | static const int req_level = 64; | ||
47 | #elif defined(CONFIG_X86_MINIMUM_CPU_FAMILY) | ||
48 | static const int req_level = CONFIG_X86_MINIMUM_CPU_FAMILY; | 45 | static const int req_level = CONFIG_X86_MINIMUM_CPU_FAMILY; |
49 | #else | ||
50 | static const int req_level = 3; | ||
51 | #endif | ||
52 | 46 | ||
53 | static const u32 req_flags[NCAPINTS] = | 47 | static const u32 req_flags[NCAPINTS] = |
54 | { | 48 | { |