From f1bb353fc5cb465b77d8368abec81a7f0749ddf8 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Sat, 16 Feb 2008 23:00:22 -0800 Subject: [PATCH] --- yaml --- r: 88598 b: refs/heads/master c: beafe91f1c2c49713221ca2616755e1f3d472084 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/srat_64.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0aa113bde194..f7d1346fd113 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28d23128814dca9b90f04739b12f967f4248c584 +refs/heads/master: beafe91f1c2c49713221ca2616755e1f3d472084 diff --git a/trunk/arch/x86/mm/srat_64.c b/trunk/arch/x86/mm/srat_64.c index 845001c617cc..04e06c8226e3 100644 --- a/trunk/arch/x86/mm/srat_64.c +++ b/trunk/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",