Merge tag 'v3.10.68' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / mm / mmu.c

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 54fc6e5c43703cb43354c0c4812dd1f0e790096c..f8e6abb67a7540489f556dc5a1cc4be18cd18b84 100644 (file)
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -708,8 +708,8 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
 }
 
 static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
-       unsigned long end, unsigned long phys, const struct mem_type *type,
-       bool force_pages)
+                                 unsigned long end, phys_addr_t phys,
+                                 const struct mem_type *type, bool force_pages)
 {
        pud_t *pud = pud_offset(pgd, addr);
        unsigned long next;