1 From: Dimitri Sivanich <sivanich@sgi.com>
2 Subject: x86: Also move detect_extended_topology before init_intel_cacheinfo(c) in init_intel()
4 Patch-Mainline: yes or at least submitted
6 This patch belongs to patches.arch/x86_fix_llc_shared_map__cpu_llc_id_anomolies.patch.
7 This one does the same change for 64 bit. Above patch is doing things for intel.c,
8 intel_64.c has been forgotten.
10 Signed-off-by: Thomas Renninger <trenn@suse.de>
13 arch/x86/kernel/cpu/intel_64.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
16 --- a/arch/x86/kernel/cpu/intel_64.c
17 +++ b/arch/x86/kernel/cpu/intel_64.c
18 @@ -67,6 +67,7 @@ static void __cpuinit srat_detect_node(v
20 static void __cpuinit init_intel(struct cpuinfo_x86 *c)
22 + detect_extended_topology(c);
23 init_intel_cacheinfo(c);
24 if (c->cpuid_level > 9) {
25 unsigned eax = cpuid_eax(10);
26 @@ -94,7 +95,6 @@ static void __cpuinit init_intel(struct
27 set_cpu_cap(c, X86_FEATURE_REP_GOOD);
28 set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
30 - detect_extended_topology(c);
31 if (!cpu_has(c, X86_FEATURE_XTOPOLOGY))
32 c->x86_max_cores = intel_num_cpu_cores(c);