diff options
author | Andi Kleen <ak@suse.de> | 2008-01-30 07:33:20 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:20 -0500 |
commit | 404ee5b14b68d3cba287c2596588b83790c49f7b (patch) | |
tree | 6007a5d2c461c3435edbc9335c84ff45ec4715ca /arch/x86/kernel/cpu/bugs.c | |
parent | 8424950b5e85543a494b5d940bb2f5f9f16f56a9 (diff) |
x86: convert TSC disabling to generic cpuid disable bitmap
Fix from: Ian Campbell <ijc@hellion.org.uk>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/cpu/bugs.c')
-rw-r--r-- | arch/x86/kernel/cpu/bugs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index a96abd453e0d..9b95edcfc6ae 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c | |||
@@ -154,7 +154,7 @@ static void __init check_config(void) | |||
154 | * If we configured ourselves for a TSC, we'd better have one! | 154 | * If we configured ourselves for a TSC, we'd better have one! |
155 | */ | 155 | */ |
156 | #ifdef CONFIG_X86_TSC | 156 | #ifdef CONFIG_X86_TSC |
157 | if (!cpu_has_tsc && !tsc_disable) | 157 | if (!cpu_has_tsc) |
158 | panic("Kernel compiled for Pentium+, requires TSC feature!"); | 158 | panic("Kernel compiled for Pentium+, requires TSC feature!"); |
159 | #endif | 159 | #endif |
160 | 160 | ||