diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-02 16:18:54 +0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-02 16:18:54 +0400 |
| commit | 7888e96b264fad27f97f58c0f3a4d20326eaf181 (patch) | |
| tree | 8ef77da9bd9b5491fadd6b01dd7de8fdf9d6eec5 /arch/x86/mm/numa_internal.h | |
| parent | 99cca492ea8ced305bfd687521ed69fb9e0147aa (diff) | |
| download | linux-7888e96b264fad27f97f58c0f3a4d20326eaf181.tar.xz | |
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_internal.h')
| -rw-r--r-- | arch/x86/mm/numa_internal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/mm/numa_internal.h b/arch/x86/mm/numa_internal.h index ad86ec91e640..7178c3afe05e 100644 --- a/arch/x86/mm/numa_internal.h +++ b/arch/x86/mm/numa_internal.h @@ -21,6 +21,12 @@ void __init numa_reset_distance(void); void __init x86_numa_init(void); +#ifdef CONFIG_X86_64 +static inline void init_alloc_remap(int nid, u64 start, u64 end) { } +#else +void __init init_alloc_remap(int nid, u64 start, u64 end); +#endif + #ifdef CONFIG_NUMA_EMU void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt); |