1 files changed, 3 insertions, 2 deletions

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 7338c5d3dd37..c590fd200e29 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -47,7 +47,7 @@ static inline int phys_addr_valid(unsigned long addr)
 
 int page_is_ram(unsigned long pagenr)
 {
-        unsigned long addr, end;
+        resource_size_t addr, end;
         int i;
 
         /*
@@ -120,7 +120,8 @@ int ioremap_change_attr(unsigned long vaddr, unsigned long size,
 static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
                                unsigned long prot_val)
 {
-        unsigned long pfn, offset, last_addr, vaddr;
+        unsigned long pfn, offset, vaddr;
+        resource_size_t last_addr;
         struct vm_struct *area;
         unsigned long new_prot_val;
         pgprot_t prot;