From cc56cd2f7e06f5f26708a4cfb9c5dbc5c69e50d0 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 5 Mar 2009 14:55:01 +0200 Subject: [PATCH] --- yaml --- r: 138673 b: refs/heads/master c: 01ced9ec14ad1b4f8a533c2f2b5a4fe4c92c1099 h: refs/heads/master i: 138671: 379332e3010106148822a03cf2e4b8cc6ee67813 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init_32.c | 6 ++++++ trunk/arch/x86/mm/init_64.c | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6f8cd2f36d41..c463b236d60a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d58e854e36ddf241ebc243e4122c5ab087bf38df +refs/heads/master: 01ced9ec14ad1b4f8a533c2f2b5a4fe4c92c1099 diff --git a/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c index 0a3707fb973b..3f91bdc20971 100644 --- a/trunk/arch/x86/mm/init_32.c +++ b/trunk/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/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c index e4fadea2e521..5ecb23a57d2f 100644 --- a/trunk/arch/x86/mm/init_64.c +++ b/trunk/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)