diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/cpu/common.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/common_64.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 7d5a07f0fd24..1f80ce07daa2 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
@@ -263,9 +263,9 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) | |||
263 | l2size, ecx & 0xFF); | 263 | l2size, ecx & 0xFF); |
264 | } | 264 | } |
265 | 265 | ||
266 | #ifdef CONFIG_X86_HT | ||
267 | void __cpuinit detect_ht(struct cpuinfo_x86 *c) | 266 | void __cpuinit detect_ht(struct cpuinfo_x86 *c) |
268 | { | 267 | { |
268 | #ifdef CONFIG_X86_HT | ||
269 | u32 eax, ebx, ecx, edx; | 269 | u32 eax, ebx, ecx, edx; |
270 | int index_msb, core_bits; | 270 | int index_msb, core_bits; |
271 | 271 | ||
@@ -311,8 +311,8 @@ out: | |||
311 | printk(KERN_INFO "CPU: Processor Core ID: %d\n", | 311 | printk(KERN_INFO "CPU: Processor Core ID: %d\n", |
312 | c->cpu_core_id); | 312 | c->cpu_core_id); |
313 | } | 313 | } |
314 | } | ||
315 | #endif | 314 | #endif |
315 | } | ||
316 | 316 | ||
317 | static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c) | 317 | static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c) |
318 | { | 318 | { |
diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c index bcb48ce05d23..8e630734e1fd 100644 --- a/arch/x86/kernel/cpu/common_64.c +++ b/arch/x86/kernel/cpu/common_64.c | |||
@@ -141,7 +141,7 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) | |||
141 | 141 | ||
142 | void __cpuinit detect_ht(struct cpuinfo_x86 *c) | 142 | void __cpuinit detect_ht(struct cpuinfo_x86 *c) |
143 | { | 143 | { |
144 | #ifdef CONFIG_SMP | 144 | #ifdef CONFIG_X86_HT |
145 | u32 eax, ebx, ecx, edx; | 145 | u32 eax, ebx, ecx, edx; |
146 | int index_msb, core_bits; | 146 | int index_msb, core_bits; |
147 | 147 | ||