diff options
author | Tejun Heo <tj@kernel.org> | 2011-05-02 08:18:53 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-05-02 08:18:53 -0400 |
commit | e6df595b37c7c033ef7400b4fdd382a2dc4f4131 (patch) | |
tree | 23488915357a565777e244e6c7448c0e142e9248 /arch/x86/mm | |
parent | daf4f480ae24270bac06db4293908d36b4834e21 (diff) |
x86, NUMA: Move numa_nodes_parsed to numa.[hc]
Move numa_nodes_parsed from numa_64.[hc] to numa.[hc] to prepare for
NUMA init path unification.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/numa.c | 1 | ||||
-rw-r--r-- | arch/x86/mm/numa_64.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index e9005c4ea29a..cce174109ca9 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <asm/acpi.h> | 6 | #include <asm/acpi.h> |
7 | 7 | ||
8 | int __initdata numa_off; | 8 | int __initdata numa_off; |
9 | nodemask_t numa_nodes_parsed __initdata; | ||
9 | 10 | ||
10 | static __init int numa_setup(char *opt) | 11 | static __init int numa_setup(char *opt) |
11 | { | 12 | { |
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 287ae798935f..70bd8221f928 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c | |||
@@ -26,8 +26,6 @@ | |||
26 | struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; | 26 | struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; |
27 | EXPORT_SYMBOL(node_data); | 27 | EXPORT_SYMBOL(node_data); |
28 | 28 | ||
29 | nodemask_t numa_nodes_parsed __initdata; | ||
30 | |||
31 | static struct numa_meminfo numa_meminfo | 29 | static struct numa_meminfo numa_meminfo |
32 | #ifndef CONFIG_MEMORY_HOTPLUG | 30 | #ifndef CONFIG_MEMORY_HOTPLUG |
33 | __initdata | 31 | __initdata |