Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 131975
b: refs/heads/master
c: 5ce04e3
h: refs/heads/master
i:
  131973: 6b495ab
  131971: 53be90e
  131967: 47881ee
v: v3
  • Loading branch information
Pallipadi, Venkatesh authored and Ingo Molnar committed Mar 2, 2009
1 parent 0791aa4 commit 95d335c
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 92b9af9e4f144535c65aee673cfad309f25fa465
refs/heads/master: 5ce04e3de8c36ba37c56e94e3c4dc7973c7f546c
5 changes: 4 additions & 1 deletion trunk/include/linux/io-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,11 @@ io_mapping_unmap_atomic(void *vaddr)
static inline void *
io_mapping_map_wc(struct io_mapping *mapping, unsigned long offset)
{
resource_size_t phys_addr;

BUG_ON(offset >= mapping->size);
resource_size_t phys_addr = mapping->base + offset;
phys_addr = mapping->base + offset;

return ioremap_wc(phys_addr, PAGE_SIZE);
}

Expand Down

0 comments on commit 95d335c

Please sign in to comment.