Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11c231a9 authored by Suresh Siddha's avatar Suresh Siddha Committed by Ingo Molnar
Browse files

x86: use x2apic id reported by cpuid during topology discovery, fix 



v2: Fix for !SMP build

Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e17941b0

arch/x86/kernel/cpu/addon_cpuid_features.c

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ void __cpuinit init_scattered_cpuid_features(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 ht_mask_width, core_plus_mask_width;

	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",

		       c->cpu_core_id);

	return;

#endif

}



#ifdef CONFIG_X86_PAT