diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-03-05 07:55:01 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 08:17:15 -0500 |
commit | 01ced9ec14ad1b4f8a533c2f2b5a4fe4c92c1099 (patch) | |
tree | c40e6de0257182517e65ae0133e2b8a0d96d14a1 /arch/x86/mm/init_32.c | |
parent | d58e854e36ddf241ebc243e4122c5ab087bf38df (diff) |
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>
Diffstat (limited to 'arch/x86/mm/init_32.c')
-rw-r--r-- | arch/x86/mm/init_32.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 0a3707fb973b..3f91bdc20971 100644 --- 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, | |||
1054 | mr[i].page_size_mask); | 1054 | mr[i].page_size_mask); |
1055 | #endif | 1055 | #endif |
1056 | 1056 | ||
1057 | #ifdef CONFIG_X86_32 | ||
1057 | early_ioremap_page_table_range_init(); | 1058 | early_ioremap_page_table_range_init(); |
1058 | 1059 | ||
1059 | load_cr3(swapper_pg_dir); | 1060 | load_cr3(swapper_pg_dir); |
1061 | #endif | ||
1060 | 1062 | ||
1063 | #ifdef CONFIG_X86_64 | ||
1064 | if (!after_bootmem) | ||
1065 | mmu_cr4_features = read_cr4(); | ||
1066 | #endif | ||
1061 | __flush_tlb_all(); | 1067 | __flush_tlb_all(); |
1062 | 1068 | ||
1063 | if (!after_bootmem && table_end > table_start) | 1069 | if (!after_bootmem && table_end > table_start) |