diff options
| author | Suresh Siddha <suresh.b.siddha@intel.com> | 2008-08-23 17:47:11 +0200 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-28 18:05:19 +1000 |
| commit | 8fdfcc408cf91ca0d46e45925ddec0b0dc93f271 (patch) | |
| tree | c9e55fabeaf332c446a372279aeb8598840cf350 | |
| parent | 1d9915b19f88c7ed0e71c51d85b09dadc41d01e8 (diff) | |
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>
| -rw-r--r-- | arch/x86/kernel/cpu/addon_cpuid_features.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c index f63a8a49620e..0d9c993aa93e 100644 --- a/arch/x86/kernel/cpu/addon_cpuid_features.c +++ b/arch/x86/kernel/cpu/addon_cpuid_features.c @@ -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 |