x86: ifdef 32-bit and 64-bit setup in init_memory_mapping()

Impact: cleanup

To reduce the diff between the 32-bit and 64-bit versions of
init_memory_mapping(), ifdef configuration specific setup code
in the function.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1236257708-27269-10-git-send-email-penberg@cs.helsinki.fi>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 0a3707fb973b186becd6e58da744ecdedb7b36b7..3f91bdc209714bd792888117d39b0eea8808a78b 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -1054,10 +1054,16 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
                                                   mr[i].page_size_mask);
 #endif
 
+#ifdef CONFIG_X86_32
        early_ioremap_page_table_range_init();
 
        load_cr3(swapper_pg_dir);
+#endif
 
+#ifdef CONFIG_X86_64
+       if (!after_bootmem)
+               mmu_cr4_features = read_cr4();
+#endif
        __flush_tlb_all();
 
        if (!after_bootmem && table_end > table_start)

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index e4fadea2e5218610d587ccd8fcc40e6518b303ff..5ecb23a57d2fa904ce0aaea20bfdee762a3512e1 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -832,8 +832,16 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
                                                   mr[i].page_size_mask);
 #endif
 
+#ifdef CONFIG_X86_32
+       early_ioremap_page_table_range_init();
+
+       load_cr3(swapper_pg_dir);
+#endif
+
+#ifdef CONFIG_X86_64
        if (!after_bootmem)
                mmu_cr4_features = read_cr4();
+#endif
        __flush_tlb_all();
 
        if (!after_bootmem && table_end > table_start)