x86: move fix mapping page table range early

do that in init_memory_mapping

also remove one init_ohci1394_dma_on_all_controllers

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 20 insertions, 18 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 161609c6925e..bf528b23750a 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -611,11 +611,6 @@ void __init setup_arch(char **cmdline_p)
 
 #ifdef CONFIG_X86_32
         probe_roms();
-#else
-# ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
-        if (init_ohci1394_dma_early)
-                init_ohci1394_dma_on_all_controllers();
-# endif
 #endif
 
         /* after parse_early_param, so could debug it */
@@ -672,6 +667,15 @@ void __init setup_arch(char **cmdline_p)
         /* max_pfn_mapped is updated here */
         max_pfn_mapped = init_memory_mapping(0, (max_low_pfn << PAGE_SHIFT));
 
+        /*
+         * NOTE: On x86-32, only from this point on, fixmaps are ready for use.
+         */
+
+#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
+        if (init_ohci1394_dma_early)
+                init_ohci1394_dma_on_all_controllers();
+#endif
+
         reserve_initrd();
 
 #ifdef CONFIG_X86_64
@@ -739,15 +743,6 @@ void __init setup_arch(char **cmdline_p)
         map_vsyscall();
 #endif
 
-        /*
-         * NOTE: On x86-32, only from this point on, fixmaps are ready for use.
-         */
-
-#if defined(CONFIG_PROVIDE_OHCI1394_DMA_INIT) && defined(CONFIG_X86_32)
-        if (init_ohci1394_dma_early)
-                init_ohci1394_dma_on_all_controllers();
-#endif
-
 #ifdef CONFIG_X86_GENERICARCH
         generic_apic_probe();
 #endif
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 156000de6e62..b9cf7f705302 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -442,13 +442,10 @@ void __init native_pagetable_setup_done(pgd_t *base)
  * be partially populated, and so it avoids stomping on any existing
  * mappings.
  */
-static void __init pagetable_init(void)
+static void __init early_ioremap_page_table_range_init(pgd_t *pgd_base)
 {
-        pgd_t *pgd_base = swapper_pg_dir;
         unsigned long vaddr, end;
 
-        paravirt_pagetable_setup_start(pgd_base);
-
         /*
          * Fixed mappings, only the page table structure has to be
          * created - mappings will be set by set_fixmap():
@@ -458,6 +455,13 @@ static void __init pagetable_init(void)
         end = (FIXADDR_TOP + PMD_SIZE - 1) & PMD_MASK;
         page_table_range_init(vaddr, end, pgd_base);
         early_ioremap_reset();
+}
+
+static void __init pagetable_init(void)
+{
+        pgd_t *pgd_base = swapper_pg_dir;
+
+        paravirt_pagetable_setup_start(pgd_base);
 
         permanent_kmaps_init(pgd_base);
 
@@ -788,6 +792,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
 
         kernel_physical_mapping_init(pgd_base, start, end);
 
+        early_ioremap_page_table_range_init(pgd_base);
+
         load_cr3(swapper_pg_dir);
 
         __flush_tlb_all();
@@ -799,6 +805,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
         return end >> PAGE_SHIFT;
 }
 
+
 /*
  * paging_init() sets up the page tables - note that the first 8MB are
  * already mapped by head.S.