diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:21:21 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:21:21 +0200 |
commit | 9042763808c5285a1a61b45b0fe98a710a4c903c (patch) | |
tree | 349be736a3b56a64c8835df03f127959bfc6e0e0 /arch/x86/kernel/cpu/intel.c | |
parent | Merge branch 'x86/cpu' into x86/core (diff) | |
parent | Merge branch 'x86/cpu' into x86/x2apic (diff) | |
download | linux-9042763808c5285a1a61b45b0fe98a710a4c903c.tar.xz linux-9042763808c5285a1a61b45b0fe98a710a4c903c.zip |
Merge branch 'x86/x2apic' into x86/core
Conflicts:
arch/x86/kernel/cpu/common_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/intel.c')
-rw-r--r-- | arch/x86/kernel/cpu/intel.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index c5ac08124adc..959417b8cd64 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -176,9 +176,16 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) if (p) strcpy(c->x86_model_id, p); - c->x86_max_cores = num_cpu_cores(c); - - detect_ht(c); + detect_extended_topology(c); + + if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) { + /* + * let's use the legacy cpuid vector 0x1 and 0x4 for topology + * detection. + */ + c->x86_max_cores = num_cpu_cores(c); + detect_ht(c); + } /* Work around errata */ Intel_errata_workarounds(c); |