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>
This commit is contained in:
parent
0c8c708a7e
commit
97e4db7c87
@ -263,9 +263,9 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)
|
|||||||
l2size, ecx & 0xFF);
|
l2size, ecx & 0xFF);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_X86_HT
|
|
||||||
void __cpuinit detect_ht(struct cpuinfo_x86 *c)
|
void __cpuinit detect_ht(struct cpuinfo_x86 *c)
|
||||||
{
|
{
|
||||||
|
#ifdef CONFIG_X86_HT
|
||||||
u32 eax, ebx, ecx, edx;
|
u32 eax, ebx, ecx, edx;
|
||||||
int index_msb, core_bits;
|
int index_msb, core_bits;
|
||||||
|
|
||||||
@ -311,8 +311,8 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)
|
|||||||
printk(KERN_INFO "CPU: Processor Core ID: %d\n",
|
printk(KERN_INFO "CPU: Processor Core ID: %d\n",
|
||||||
c->cpu_core_id);
|
c->cpu_core_id);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)
|
static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)
|
||||||
{
|
{
|
||||||
|
@ -141,7 +141,7 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)
|
|||||||
|
|
||||||
void __cpuinit detect_ht(struct cpuinfo_x86 *c)
|
void __cpuinit detect_ht(struct cpuinfo_x86 *c)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_X86_HT
|
||||||
u32 eax, ebx, ecx, edx;
|
u32 eax, ebx, ecx, edx;
|
||||||
int index_msb, core_bits;
|
int index_msb, core_bits;
|
||||||
|
|
||||||
|
@ -166,11 +166,7 @@ extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
|
|||||||
extern unsigned short num_cache_leaves;
|
extern unsigned short num_cache_leaves;
|
||||||
|
|
||||||
extern void detect_extended_topology(struct cpuinfo_x86 *c);
|
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);
|
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,
|
static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
|
||||||
unsigned int *ecx, unsigned int *edx)
|
unsigned int *ecx, unsigned int *edx)
|
||||||
|
Loading…
Reference in New Issue
Block a user