aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2008-08-15 19:38:47 +0200
committerAndi Kleen <ak@linux.intel.com>2008-08-15 19:38:47 +0200
commita6006834866229aa40393ae1dac7ecf05b11e6e0 (patch)
treeeab46235c9dad8bf634840fb4d66b06961d06393
parent0f2456236459f3ddef48a8a75d10b2d6ecf1a93d (diff)
parente213e87785559eaf3107897226817aea9291b06f (diff)
Merge branch 'ioremap' into release-2.6.27
-rw-r--r--arch/x86/mm/ioremap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 016f335bbee..6ba6f889c79 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -170,7 +170,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
phys_addr &= PAGE_MASK;
size = PAGE_ALIGN(last_addr+1) - phys_addr;
- retval = reserve_memtype(phys_addr, phys_addr + size,
+ retval = reserve_memtype(phys_addr, (u64)phys_addr + size,
prot_val, &new_prot_val);
if (retval) {
pr_debug("Warning: reserve_memtype returned %d\n", retval);