Commit 765af22d authored Apr 04, 2011 by Tejun Heo Committed by Ingo Molnar Apr 04, 2011

x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change



Commit d8fc3afc (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@kernel.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: David Rientjes <rientjes@google.com>
Cc: H. Peter Anvin <hpa@linux.intel.com>
LKML-Reference: <20110404100645.GE1420@mtj.dyndns.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 43a6246f

arch/x86/mm/srat_32.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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");

Admin message