From: travis@sgi.com
To: Andrew Morton <akpm@linux-foundation.org>,
Andi Kleen <ak@suse.de>,
mingo@elte.hu
Cc: Christoph Lameter <clameter@sgi.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/1] x86: fix early cpu_to_node panic from nr_free_zone_pages
Date: Mon, 21 Jan 2008 15:06:45 -0800 [thread overview]
Message-ID: <20080121230647.038245000@sgi.com> (raw)
In-Reply-To: 20080121230644.752379000@sgi.com
[-- Attachment #1: fix-cpu_to_node-panic --]
[-- Type: text/plain, Size: 1491 bytes --]
An early call to nr_free_zone_pages() calls numa_node_id() which
needs to call early_cpu_to_node() since per_cpu(cpu_to_node_map)
might not be setup yet.
I also had to export x86_cpu_to_node_map_early_ptr because of some
calls from the network code to numa_node_id():
net/ipv4/netfilter/arp_tables.c:
net/ipv4/netfilter/ip_tables.c:
net/ipv4/netfilter/ip_tables.c:
Applies to both:
2.6.24-rc8-mm1
2.6.24-rc8-mm1 + latest (08/01/21) git-x86 patch
Signed-off-by: Mike Travis <travis@sgi.com>
---
arch/x86/mm/numa_64.c | 2 --
include/asm-x86/topology.h | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -37,9 +37,7 @@ int x86_cpu_to_node_map_init[NR_CPUS] =
void *x86_cpu_to_node_map_early_ptr;
DEFINE_PER_CPU(int, x86_cpu_to_node_map) = NUMA_NO_NODE;
EXPORT_PER_CPU_SYMBOL(x86_cpu_to_node_map);
-#ifdef CONFIG_DEBUG_PER_CPU_MAPS
EXPORT_SYMBOL(x86_cpu_to_node_map_early_ptr);
-#endif
s16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = {
[0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE
--- a/include/asm-x86/topology.h
+++ b/include/asm-x86/topology.h
@@ -37,6 +37,8 @@ extern int cpu_to_node_map[];
DECLARE_PER_CPU(int, x86_cpu_to_node_map);
extern int x86_cpu_to_node_map_init[];
extern void *x86_cpu_to_node_map_early_ptr;
+/* Returns the number of the current Node. */
+#define numa_node_id() (early_cpu_to_node(raw_smp_processor_id()))
#endif
extern cpumask_t node_to_cpumask_map[];
--
next parent reply other threads:[~2008-01-21 23:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20080121230644.752379000@sgi.com>
2008-01-21 23:06 ` travis [this message]
2008-01-22 11:22 ` [PATCH 1/1] x86: fix early cpu_to_node panic from nr_free_zone_pages Ingo Molnar
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=20080121230647.038245000@sgi.com \
--to=travis@sgi.com \
--cc=ak@suse.de \
--cc=akpm@linux-foundation.org \
--cc=clameter@sgi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mingo@elte.hu \
/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;
as well as URLs for NNTP newsgroup(s).