1
0
Fork 0

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>
hifive-unleashed-5.1
Pekka Enberg 2009-03-05 14:55:01 +02:00 committed by Ingo Molnar
parent d58e854e36
commit 01ced9ec14
2 changed files with 14 additions and 0 deletions

View File

@ -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)

View File

@ -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)