Messages in this thread Patch in this message | | | Date | Tue, 25 Aug 2009 12:51:08 -0700 | From | Yinghai Lu <> | Subject | [PATCH] x86: use c->apicid directly in srat_detect_node |
| |
need applied after | [PATCH] x86: use hard_smp_processor_id to get apic id in identify_cpu
don't need to read it again, just use stored value.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
--- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/intel.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Index: linux-2.6/arch/x86/kernel/cpu/amd.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/cpu/amd.c +++ linux-2.6/arch/x86/kernel/cpu/amd.c @@ -277,7 +277,7 @@ static void __cpuinit srat_detect_node(s #if defined(CONFIG_NUMA) && defined(CONFIG_X86_64) int cpu = smp_processor_id(); int node; - unsigned apicid = cpu_has_apic ? hard_smp_processor_id() : c->apicid; + unsigned apicid = c->apicid; node = c->phys_proc_id; if (apicid_to_node[apicid] != NUMA_NO_NODE) Index: linux-2.6/arch/x86/kernel/cpu/intel.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/cpu/intel.c +++ linux-2.6/arch/x86/kernel/cpu/intel.c @@ -258,7 +258,7 @@ static void __cpuinit srat_detect_node(s #if defined(CONFIG_NUMA) && defined(CONFIG_X86_64) unsigned node; int cpu = smp_processor_id(); - int apicid = cpu_has_apic ? hard_smp_processor_id() : c->apicid; + int apicid = c->apicid; /* Don't do the funky fallback heuristics the AMD version employs for now. */
| |