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 <[email protected]>
Cc: Yinghai Lu <[email protected]>
Cc: Cyrill Gorcunov <[email protected]>
Cc: David Rientjes <[email protected]>
Cc: H. Peter Anvin <[email protected]>
LKML-Reference: <20110404100645[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c
index 48651c6f657d58605ef5ab6ac54ec3ff03400ac0..364f36bdfad878b897a3119a23006856b526bf48 100644 (file)
--- 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");