[PATCH tip:x86/urgent] x86-32, NUMA: Fix ACPI NUMA init broken byrecent x86-64 change

[Tejun Heo]

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 breking 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: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
 arch/x86/mm/srat_32.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: work/arch/x86/mm/srat_32.c
===================================================================
--- work.orig/arch/x86/mm/srat_32.c
+++ work/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-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/