xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: move fix mapping page table range early

Browse Source 
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>
This commit is contained in:
Yinghai Lu
2008-06-25 21:51:28 -07:00
committed by Ingo Molnar
parent 042623bbab
commit e7b3789524
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/x86/mm/init_32.c
View File

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