diff options
author | Yinghai Lu <Yinghai.Lu@Sun.COM> | 2008-02-17 02:00:22 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:40:47 -0400 |
commit | beafe91f1c2c49713221ca2616755e1f3d472084 (patch) | |
tree | 555410af36b0cee2634fd51c5db8fe8e9abac14e /arch/x86/mm/srat_64.c | |
parent | 28d23128814dca9b90f04739b12f967f4248c584 (diff) |
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>
Diffstat (limited to 'arch/x86/mm/srat_64.c')
-rw-r--r-- | arch/x86/mm/srat_64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 845001c617cc..04e06c8226e3 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) | |||
132 | int pxm, node; | 132 | int pxm, node; |
133 | int apic_id; | 133 | int apic_id; |
134 | 134 | ||
135 | apic_id = pa->apic_id; | ||
136 | if (srat_disabled()) | 135 | if (srat_disabled()) |
137 | return; | 136 | return; |
138 | if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) { | 137 | 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) | |||
148 | bad_srat(); | 147 | bad_srat(); |
149 | return; | 148 | return; |
150 | } | 149 | } |
150 | |||
151 | apic_id = pa->apic_id; | ||
151 | apicid_to_node[apic_id] = node; | 152 | apicid_to_node[apic_id] = node; |
152 | acpi_numa = 1; | 153 | acpi_numa = 1; |
153 | printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n", | 154 | printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n", |