Merge branch 'ioremap' into release-2.6.27

a6006834 · Andi Kleen · 0f245623 · e213e877 · a6006834
Commit a6006834 authored Aug 15, 2008 by Andi Kleen
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/x86/mm/ioremap.c arch/x86/mm/ioremap.c +1 -1

No files found.
--- 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);