aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/mmu.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mm/mmu.c')
-rw-r--r--arch/arm/mm/mmu.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 72ad3e1f56cf..9568f8632ae3 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -535,7 +535,7 @@ static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr, unsigned l
535{ 535{
536 if (pmd_none(*pmd)) { 536 if (pmd_none(*pmd)) {
537 pte_t *pte = early_alloc(2 * PTRS_PER_PTE * sizeof(pte_t)); 537 pte_t *pte = early_alloc(2 * PTRS_PER_PTE * sizeof(pte_t));
538 __pmd_populate(pmd, __pa(pte) | prot); 538 __pmd_populate(pmd, __pa(pte), prot);
539 } 539 }
540 BUG_ON(pmd_bad(*pmd)); 540 BUG_ON(pmd_bad(*pmd));
541 return pte_offset_kernel(pmd, addr); 541 return pte_offset_kernel(pmd, addr);
@@ -553,7 +553,7 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
553} 553}
554 554
555static void __init alloc_init_section(pgd_t *pgd, unsigned long addr, 555static void __init alloc_init_section(pgd_t *pgd, unsigned long addr,
556 unsigned long end, unsigned long phys, 556 unsigned long end, phys_addr_t phys,
557 const struct mem_type *type) 557 const struct mem_type *type)
558{ 558{
559 pmd_t *pmd = pmd_offset(pgd, addr); 559 pmd_t *pmd = pmd_offset(pgd, addr);
@@ -588,7 +588,8 @@ static void __init alloc_init_section(pgd_t *pgd, unsigned long addr,
588static void __init create_36bit_mapping(struct map_desc *md, 588static void __init create_36bit_mapping(struct map_desc *md,
589 const struct mem_type *type) 589 const struct mem_type *type)
590{ 590{
591 unsigned long phys, addr, length, end; 591 unsigned long addr, length, end;
592 phys_addr_t phys;
592 pgd_t *pgd; 593 pgd_t *pgd;
593 594
594 addr = md->virtual; 595 addr = md->virtual;