x86, mm: only call early_ioremap_page_table_range_init() once

On 32bit, before patcheset that only set page table for ram, we only
call that one time.

Now, we are calling that during every init_memory_mapping if we have holes
under max_low_pfn.

We should only call it one time after all ranges under max_low_page get
mapped just like we did before.

Also that could avoid the risk to run out of pgt_buf in BRK.

Need to update page_table_range_init() to count the pages for kmap page table
at first, and use new added alloc_low_pages() to get pages in sequence.
That will conform to the requirement that pages need to be in low to high order.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1353123563-3103-30-git-send-email-yinghai@kernel.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index cb4f8ba70ecc..bed4888c6f4f 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -343,14 +343,6 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
                 ret = kernel_physical_mapping_init(mr[i].start, mr[i].end,
                                                    mr[i].page_size_mask);
 
-#ifdef CONFIG_X86_32
-        early_ioremap_page_table_range_init();
-
-        load_cr3(swapper_pg_dir);
-#endif
-
-        __flush_tlb_all();
-
         add_pfn_range_mapped(start >> PAGE_SHIFT, ret >> PAGE_SHIFT);
 
         return ret >> PAGE_SHIFT;
@@ -447,7 +439,12 @@ void __init init_mem_mapping(void)
                 /* can we preseve max_low_pfn ?*/
                 max_low_pfn = max_pfn;
         }
+#else
+        early_ioremap_page_table_range_init();
+        load_cr3(swapper_pg_dir);
+        __flush_tlb_all();
 #endif
+
         early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
 }