diff options
author | Tejun Heo <tj@kernel.org> | 2011-05-02 08:18:54 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-05-02 08:18:54 -0400 |
commit | 7888e96b264fad27f97f58c0f3a4d20326eaf181 (patch) | |
tree | 8ef77da9bd9b5491fadd6b01dd7de8fdf9d6eec5 /arch/x86/mm/numa_32.c | |
parent | 99cca492ea8ced305bfd687521ed69fb9e0147aa (diff) |
x86, NUMA: Initialize and use remap allocator from setup_node_bootmem()
setup_node_bootmem() is taken from 64bit and doesn't use remap
allocator. It's about to be shared with 32bit so add support for it.
If NODE_DATA is remapped, it's noted in the debug message and node
locality check is skipped as the __pa() of the remapped address
doesn't reflect the actual physical address.
On 64bit, remap allocator becomes noop and doesn't affect the
behavior.
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/numa_32.c')
-rw-r--r-- | arch/x86/mm/numa_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c index 900863204be2..fbd558fe10bc 100644 --- a/arch/x86/mm/numa_32.c +++ b/arch/x86/mm/numa_32.c | |||
@@ -265,7 +265,7 @@ void resume_map_numa_kva(pgd_t *pgd_base) | |||
265 | * opportunistically and the callers will fall back to other memory | 265 | * opportunistically and the callers will fall back to other memory |
266 | * allocation mechanisms on failure. | 266 | * allocation mechanisms on failure. |
267 | */ | 267 | */ |
268 | static __init void init_alloc_remap(int nid, u64 start, u64 end) | 268 | void __init init_alloc_remap(int nid, u64 start, u64 end) |
269 | { | 269 | { |
270 | unsigned long start_pfn = start >> PAGE_SHIFT; | 270 | unsigned long start_pfn = start >> PAGE_SHIFT; |
271 | unsigned long end_pfn = end >> PAGE_SHIFT; | 271 | unsigned long end_pfn = end >> PAGE_SHIFT; |