From: Tejun Heo <tj@kernel.org>
To: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>,
Cyrill Gorcunov <gorcunov@gmail.com>,
David Rientjes <rientjes@google.com>,
"H. Peter Anvin" <hpa@linux.intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH tip:x86/urgent] x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change
Date: Mon, 4 Apr 2011 03:06:45 -0700 [thread overview]
Message-ID: <20110404100645.GE1420@mtj.dyndns.org> (raw)
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");
next reply other threads:[~2011-04-04 10:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-04 10:06 Tejun Heo [this message]
2011-04-04 16:03 ` [tip:x86/urgent] " tip-bot for Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110404100645.GE1420@mtj.dyndns.org \
--to=tj@kernel.org \
--cc=gorcunov@gmail.com \
--cc=hpa@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rientjes@google.com \
--cc=tglx@linutronix.de \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®