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

[PATCH tip:x86/urgent] x86-32, NUMA: Fix ACPI NUMA init broken by recent 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@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
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>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
 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");

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

[tip-bot for Tejun Heo]

Commit-ID:  765af22da8a61bd44d354b3c3be955c332325b2f
Gitweb:     http://git.kernel.org/tip/765af22da8a61bd44d354b3c3be955c332325b2f
Author:     Tejun Heo <tj@kernel.org>
AuthorDate: Mon, 4 Apr 2011 03:06:45 -0700
Committer:  Ingo Molnar <mingo@elte.hu>
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@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>
---
 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");