Merge branch 'ioremap' into release-2.6.27

git-mirror · Aug 15, 2008 · a600683 · a600683
2 parents 0f24562 + e213e87
commit a600683
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);