Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88904
b: refs/heads/master
c: b450e5e
h: refs/heads/master
v: v3
  • Loading branch information
Venki Pallipadi authored and Ingo Molnar committed Apr 17, 2008
1 parent 87ead84 commit 1803d3d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dee7cbb210fdd266ad81af4689bcbac3649f38ff
refs/heads/master: b450e5e816d10893e17f57b3eb9d29c52635862a
4 changes: 2 additions & 2 deletions trunk/arch/x86/mm/ioremap.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
retval = reserve_memtype(phys_addr, phys_addr + size,
prot_val, &new_prot_val);
if (retval) {
printk("reserve_memtype returned %d\n", retval);
pr_debug("Warning: reserve_memtype returned %d\n", retval);
return NULL;
}

Expand All @@ -184,7 +184,7 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
new_prot_val == _PAGE_CACHE_WC)) ||
(prot_val == _PAGE_CACHE_WC &&
new_prot_val == _PAGE_CACHE_WB)) {
printk(
pr_debug(
"ioremap error for 0x%llx-0x%llx, requested 0x%lx, got 0x%lx\n",
phys_addr, phys_addr + size,
prot_val, new_prot_val);
Expand Down

0 comments on commit 1803d3d

Please sign in to comment.