From: Yinghai Lu <Yinghai.Lu@Sun.COM>
Date: Sun, 17 Feb 2008 07:00:22 +0000 (-0800)
Subject: x86: get apic_id later in acpi_numa_processor_affinity_init
X-Git-Tag: v2.6.26-rc1~1154^2~584
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=beafe91f1c2c49713221ca2616755e1f3d472084;p=linux-2.6-omap-h63xx.git

x86: get apic_id later in acpi_numa_processor_affinity_init

we don't need get that so early.

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index 845001c617c..04e06c8226e 100644
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -132,7 +132,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
 	int pxm, node;
 	int apic_id;
 
-	apic_id = pa->apic_id;
 	if (srat_disabled())
 		return;
 	if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) {
@@ -148,6 +147,8 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
 		bad_srat();
 		return;
 	}
+
+	apic_id = pa->apic_id;
 	apicid_to_node[apic_id] = node;
 	acpi_numa = 1;
 	printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n",