diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-24 12:19:41 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 13:10:33 +0200 |
| commit | 3a58a2a6c879b2e47daafd6e641661c50ac9da5a (patch) | |
| tree | 40291091c6114692edcc34beae5d648382b651da /arch/x86/mm/discontig_32.c | |
| parent | cfb0e53b05402f1ce65053677409a819c1798d34 (diff) | |
| download | blackbird-op-linux-3a58a2a6c879b2e47daafd6e641661c50ac9da5a.tar.gz blackbird-op-linux-3a58a2a6c879b2e47daafd6e641661c50ac9da5a.zip | |
x86: introduce init_memory_mapping for 32bit #3
move kva related early backto initmem_init for numa32
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/discontig_32.c')
| -rw-r--r-- | arch/x86/mm/discontig_32.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index f5ae31935ca8..42484d446d06 100644 --- a/arch/x86/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c @@ -200,7 +200,7 @@ void *alloc_remap(int nid, unsigned long size) return allocation; } -void __init remap_numa_kva(void) +static void __init remap_numa_kva(void) { void *vaddr; unsigned long pfn; @@ -373,12 +373,16 @@ void __init initmem_init(unsigned long start_pfn, allocate_pgdat(nid); } + remap_numa_kva(); + printk(KERN_DEBUG "High memory starts at vaddr %08lx\n", (ulong) pfn_to_kaddr(highstart_pfn)); for_each_online_node(nid) propagate_e820_map_node(nid); - memset(NODE_DATA(0), 0, sizeof(struct pglist_data)); + for_each_online_node(nid) + memset(NODE_DATA(nid), 0, sizeof(struct pglist_data)); + NODE_DATA(0)->bdata = &node0_bdata; setup_bootmem_allocator(); } |
