summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/init_32.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-25 21:51:28 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-08 13:16:01 +0200
commite7b3789524eecc96213dd69d6686efd429235051 (patch)
tree2d723f289663fdbbf49e967e50c1347f91e6d95f /arch/x86/mm/init_32.c
parent042623bbabae168246ad8a37693f0ecb6c450aea (diff)
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>
Diffstat (limited to 'arch/x86/mm/init_32.c')
-rw-r--r--arch/x86/mm/init_32.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 156000de6e6..b9cf7f70530 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.