diff options
| author | Tejun Heo <tj@kernel.org> | 2011-02-16 12:13:07 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-02-16 12:13:07 +0100 |
| commit | ec8cf29b1d39aeb6ef98bc589f0c9a33a8f94c49 (patch) | |
| tree | 096c8f6b23944e000628d245fd43719cd7a1b104 /arch/x86/include/asm/numa_64.h | |
| parent | x86-64, NUMA: Restructure initmem_init() (diff) | |
| download | linux-ec8cf29b1d39aeb6ef98bc589f0c9a33a8f94c49.tar.xz linux-ec8cf29b1d39aeb6ef98bc589f0c9a33a8f94c49.zip | |
x86-64, NUMA: Use common {cpu|mem}_nodes_parsed
ACPI and amd are using separate nodes_parsed masks. Add
{cpu|mem}_nodes_parsed and use them in all NUMA init methods.
Initialization of the masks and building node_possible_map are now
handled commonly by initmem_init().
dummy_numa_init() is updated to set node 0 on both masks. While at
it, move the info messages from scan to init.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Shaohui Zheng <shaohui.zheng@intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/numa_64.h')
| -rw-r--r-- | arch/x86/include/asm/numa_64.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/numa_64.h b/arch/x86/include/asm/numa_64.h index 2819afa33632..de459365d52b 100644 --- a/arch/x86/include/asm/numa_64.h +++ b/arch/x86/include/asm/numa_64.h @@ -27,6 +27,9 @@ extern void setup_node_bootmem(int nodeid, unsigned long start, */ #define NODE_MIN_SIZE (4*1024*1024) +extern nodemask_t cpu_nodes_parsed __initdata; +extern nodemask_t mem_nodes_parsed __initdata; + extern int __cpuinit numa_cpu_node(int cpu); #ifdef CONFIG_NUMA_EMU |