From: Ingo Molnar Date: Tue, 25 Mar 2008 06:31:17 +0000 (+0100) Subject: x86: ioremap of 64-bit resource on 32-bit kernel fix X-Git-Tag: v2.6.25.15~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4323dc41d8d1af7bc439816007f86559fc7e405;p=thirdparty%2Fkernel%2Fstable.git x86: ioremap of 64-bit resource on 32-bit kernel fix commit 756a6c68556600aec9460346332884d891d5beb4 upstream x86: ioremap of 64-bit resource on 32-bit kernel fix Signed-off-by: Ingo Molnar Cc: Chuck Ebbert Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 794895c6dcc99..f96b2e4d5f2b2 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -39,7 +39,7 @@ EXPORT_SYMBOL(__phys_addr); int page_is_ram(unsigned long pagenr) { - unsigned long addr, end; + resource_size_t addr, end; int i; /* @@ -109,7 +109,8 @@ static int ioremap_change_attr(unsigned long vaddr, unsigned long size, static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size, enum ioremap_mode mode) { - unsigned long pfn, offset, last_addr, vaddr; + unsigned long pfn, offset, vaddr; + resource_size_t last_addr; struct vm_struct *area; pgprot_t prot;