1 files changed, 4 insertions, 3 deletions

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index f512ad97dafe..e09744e82d50 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -591,7 +591,7 @@ static void __init create_36bit_mapping(struct map_desc *md,
         pgd_t *pgd;
 
         addr = md->virtual;
-        phys = (unsigned long)__pfn_to_phys(md->pfn);
+        phys = __pfn_to_phys(md->pfn);
         length = PAGE_ALIGN(md->length);
 
         if (!(cpu_architecture() >= CPU_ARCH_ARMv6 || cpu_is_xsc3())) {
@@ -651,7 +651,8 @@ static void __init create_36bit_mapping(struct map_desc *md,
  */
 static void __init create_mapping(struct map_desc *md)
 {
-        unsigned long phys, addr, length, end;
+        unsigned long addr, length, end;
+        phys_addr_t phys;
         const struct mem_type *type;
         pgd_t *pgd;
 
@@ -680,7 +681,7 @@ static void __init create_mapping(struct map_desc *md)
         }
 
         addr = md->virtual & PAGE_MASK;
-        phys = (unsigned long)__pfn_to_phys(md->pfn);
+        phys = __pfn_to_phys(md->pfn);
         length = PAGE_ALIGN(md->length + (md->virtual & ~PAGE_MASK));
 
         if (type->prot_l1 == 0 && ((addr | phys | length) & ~SECTION_MASK)) {