Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 328770
b: refs/heads/master
c: 088ba34
h: refs/heads/master
v: v3
  • Loading branch information
Stephen M. Cameron authored and James Bottomley committed Sep 14, 2012
1 parent cff572f commit deafd75
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: d6ebd0f758bec06041442aa62c602281005fb9ef
refs/heads/master: 088ba34c92055547ef4cc862a863334c01d9a304
3 changes: 2 additions & 1 deletion trunk/drivers/scsi/hpsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -3337,7 +3337,8 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
{
ulong page_base = ((ulong) base) & PAGE_MASK;
ulong page_offs = ((ulong) base) - page_base;
void __iomem *page_remapped = ioremap(page_base, page_offs + size);
void __iomem *page_remapped = ioremap_nocache(page_base,
page_offs + size);

return page_remapped ? (page_remapped + page_offs) : NULL;
}
Expand Down

0 comments on commit deafd75

Please sign in to comment.