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>

2 files changed, 6 insertions, 22 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();
 }
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index ecccb055b085..c059c460e32d 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -449,7 +449,6 @@ static void __init pagetable_init(void)
 
         paravirt_pagetable_setup_start(pgd_base);
 
-        remap_numa_kva();
         /*
          * Fixed mappings, only the page table structure has to be
          * created - mappings will be set by set_fixmap():
@@ -724,24 +723,6 @@ void __init setup_bootmem_allocator(void)
         after_init_bootmem = 1;
 }
 
-/*
- * The node 0 pgdat is initialized before all of these because
- * it's needed for bootmem.  node>0 pgdats have their virtual
- * space allocated before the pagetables are in place to access
- * them, so they can't be cleared then.
- *
- * This should all compile down to nothing when NUMA is off.
- */
-static void __init remapped_pgdat_init(void)
-{
-        int nid;
-
-        for_each_online_node(nid) {
-                if (nid != 0)
-                        memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
-        }
-}
-
 static void __init find_early_table_space(unsigned long end)
 {
         unsigned long puds, pmds, tables, start;
@@ -831,7 +812,6 @@ void __init paging_init(void)
         /*
          * NOTE: at this point the bootmem allocator is fully available.
          */
-        remapped_pgdat_init();
         sparse_init();
         zone_sizes_init();