]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From: Suresh Siddha <suresh.b.siddha@intel.com> |
2 | Subject: x86: use x2apic id reported by cpuid during topology discovery, fix | |
3 | References: fate #303948 and fate #303984 | |
4 | Patch-Mainline: queued for .28 | |
5 | Commit-ID: 11c231a962c740b3216eb6565149ae5a7944cba7 | |
6 | ||
7 | Signed-off-by: Thomas Renninger <trenn@suse.de> | |
8 | ||
9 | v2: Fix for !SMP build | |
10 | ||
11 | Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> | |
12 | Signed-off-by: Ingo Molnar <mingo@elte.hu> | |
13 | ||
14 | --- | |
15 | arch/x86/kernel/cpu/addon_cpuid_features.c | 2 ++ | |
16 | 1 file changed, 2 insertions(+) | |
17 | ||
18 | Index: linux-2.6.26/arch/x86/kernel/cpu/addon_cpuid_features.c | |
19 | =================================================================== | |
20 | --- linux-2.6.26.orig/arch/x86/kernel/cpu/addon_cpuid_features.c | |
21 | +++ linux-2.6.26/arch/x86/kernel/cpu/addon_cpuid_features.c | |
22 | @@ -69,6 +69,7 @@ void __cpuinit init_scattered_cpuid_feat | |
23 | */ | |
24 | void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) | |
25 | { | |
26 | +#ifdef CONFIG_SMP | |
27 | unsigned int eax, ebx, ecx, edx, sub_index; | |
28 | unsigned int ht_mask_width, core_plus_mask_width; | |
29 | unsigned int core_select_mask, core_level_siblings; | |
30 | @@ -132,6 +133,7 @@ void __cpuinit detect_extended_topology( | |
31 | printk(KERN_INFO "CPU: Processor Core ID: %d\n", | |
32 | c->cpu_core_id); | |
33 | return; | |
34 | +#endif | |
35 | } | |
36 | ||
37 | #ifdef CONFIG_X86_PAT |