diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-09-04 20:08:59 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:40:45 +0200 |
| commit | 97e4db7c8719f67c52793eeca5ec4df4c3407f2a (patch) | |
| tree | f60e552c99e8c57d13123d523a09acb634a710c2 /include/asm-x86 | |
| parent | 0c8c708a7e6b52556ee9079041f504191ec5f0e9 (diff) | |
| download | kernel-crypto-97e4db7c8719f67c52793eeca5ec4df4c3407f2a.tar.gz kernel-crypto-97e4db7c8719f67c52793eeca5ec4df4c3407f2a.tar.xz kernel-crypto-97e4db7c8719f67c52793eeca5ec4df4c3407f2a.zip | |
x86: make detect_ht depend on CONFIG_X86_HT
64-bit has X86_HT set too, so use that instead of SMP.
This also removes a include/asm-x86/processor.h ifdef.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/processor.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h index bbbbe1fc5ce..fc5e961c5b6 100644 --- a/include/asm-x86/processor.h +++ b/include/asm-x86/processor.h @@ -166,11 +166,7 @@ extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c); extern unsigned short num_cache_leaves; extern void detect_extended_topology(struct cpuinfo_x86 *c); -#if defined(CONFIG_X86_HT) || defined(CONFIG_X86_64) extern void detect_ht(struct cpuinfo_x86 *c); -#else -static inline void detect_ht(struct cpuinfo_x86 *c) {} -#endif static inline void native_cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx) |