diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-05 11:59:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 11:59:10 +0100 |
| commit | 49d2d266adff27793fed247a2e9e672d59b6ddc6 (patch) | |
| tree | aa23052f8b6e9f1a96e56873c940eef7110f0013 /include/linux/io-mapping.h | |
| parent | Merge branches 'sched/clock', 'sched/urgent' and 'linus' into sched/core (diff) | |
| parent | Linux 2.6.29-rc7 (diff) | |
| download | linux-dev-49d2d266adff27793fed247a2e9e672d59b6ddc6.tar.xz linux-dev-49d2d266adff27793fed247a2e9e672d59b6ddc6.zip | |
Merge commit 'v2.6.29-rc7' into sched/core
Diffstat (limited to 'include/linux/io-mapping.h')
| -rw-r--r-- | include/linux/io-mapping.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h index cbc2f0cd631b..0adb0f91568c 100644 --- a/include/linux/io-mapping.h +++ b/include/linux/io-mapping.h @@ -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); } |