Skip to content

L
linux-davinci
Commit a6006834 authored by Andi Kleen's avatar Andi Kleen
Browse files
Options

Merge branch 'ioremap' into release-2.6.27

parents 0f245623 e213e877
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
arch/x86/mm/ioremap.c
View file @ a6006834
...@@ -170,7 +170,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, ...@@ -170,7 +170,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
phys_addr &= PAGE_MASK; phys_addr &= PAGE_MASK;
size = PAGE_ALIGN(last_addr+1) - phys_addr; 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); prot_val, &new_prot_val);
if (retval) { if (retval) {
pr_debug("Warning: reserve_memtype returned %d\n", retval); pr_debug("Warning: reserve_memtype returned %d\n", retval);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment