aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-15 12:47:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-15 12:47:16 -0700
commit40a342664078ebcb4006a89af96f7982fac36032 (patch)
treee8bcaac5a116ab9a95ffa5d04046b0aa2159d59e /arch/x86
parent4ad193b43f6da6f15e19eda338c71e5b41383912 (diff)
parent22d9aac23562ea0e921db152f11cf39e3c2b9945 (diff)
Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6
* 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6: cpuidle: Make ladder governor honor latency requirements fully cpuidle: Menu governor fix wrong usage of measured_us cpuidle: Do not use poll_idle unless user asks for it x86: Fix ioremap off by one BUG
Diffstat (limited to 'arch/x86')
-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);