git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e17941b
)
x86: use x2apic id reported by cpuid during topology discovery, fix
author
Suresh Siddha
<suresh.b.siddha@intel.com>
Sat, 23 Aug 2008 15:47:11 +0000
(17:47 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 27 Aug 2008 07:02:19 +0000
(09:02 +0200)
v2: Fix for !SMP build
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/addon_cpuid_features.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/cpu/addon_cpuid_features.c
b/arch/x86/kernel/cpu/addon_cpuid_features.c
index
aa9641a
..
a2d1a54
100644
(file)
--- 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