x86: use x2apic id reported by cpuid during topology discovery, fix
v2: Fix for !SMP build Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
committed by
Ingo Molnar
parent
e17941b0c1
commit
11c231a962
@@ -69,6 +69,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)
|
|||||||
*/
|
*/
|
||||||
void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
|
void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
|
||||||
{
|
{
|
||||||
|
#ifdef CONFIG_SMP
|
||||||
unsigned int eax, ebx, ecx, edx, sub_index;
|
unsigned int eax, ebx, ecx, edx, sub_index;
|
||||||
unsigned int ht_mask_width, core_plus_mask_width;
|
unsigned int ht_mask_width, core_plus_mask_width;
|
||||||
unsigned int core_select_mask, core_level_siblings;
|
unsigned int core_select_mask, core_level_siblings;
|
||||||
@@ -132,6 +133,7 @@ void __cpuinit detect_extended_topology(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);
|
||||||
return;
|
return;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_X86_PAT
|
#ifdef CONFIG_X86_PAT
|
||||||
|
Reference in New Issue
Block a user