Commit-ID: 765af22da8a61bd44d354b3c3be955c332325b2f Gitweb: http://git.kernel.org/tip/765af22da8a61bd44d354b3c3be955c332325b2f Author: Tejun Heo <tj@xxxxxxxxxx> AuthorDate: Mon, 4 Apr 2011 03:06:45 -0700 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Mon, 4 Apr 2011 16:56:33 +0200 x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change Commit d8fc3afc49 (x86, NUMA: Move *_numa_init() invocations into initmem_init()) moved acpi_numa_init() call into NUMA initmem_init() but forgot to update 32bit NUMA init breaking ACPI NUMA configuration for 32bit. acpi_numa_init() call was later moved again to srat_64.c. Match it by adding the call to get_memcfg_from_srat() in srat_32.c. Signed-off-by: Tejun Heo <tj@xxxxxxxxxx> Cc: Yinghai Lu <yinghai@xxxxxxxxxx> Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> LKML-Reference: <20110404100645.GE1420@xxxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- arch/x86/mm/srat_32.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c index 48651c6..364f36b 100644 --- a/arch/x86/mm/srat_32.c +++ b/arch/x86/mm/srat_32.c @@ -211,10 +211,12 @@ int __init get_memcfg_from_srat(void) { int i, j, nid; - if (srat_disabled()) goto out_fail; + if (acpi_numa_init() < 0) + goto out_fail; + if (num_memory_chunks == 0) { printk(KERN_DEBUG "could not find any ACPI SRAT memory areas.\n"); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html