Commit 2ebf5d0d79087005e1042df2cd0f7594782746d8
1 parent
5322418502
Exists in
master
and in
6 other branches
mn10300: add missing __iomap markers
MN10300's *ioremap*() collection lacks __iomem markers. Fix that. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Showing 1 changed file with 8 additions and 8 deletions Side-by-side Diff
arch/mn10300/include/asm/io.h
| ... | ... | @@ -251,15 +251,15 @@ |
| 251 | 251 | /* |
| 252 | 252 | * Change "struct page" to physical address. |
| 253 | 253 | */ |
| 254 | -static inline void *__ioremap(unsigned long offset, unsigned long size, | |
| 255 | - unsigned long flags) | |
| 254 | +static inline void __iomem *__ioremap(unsigned long offset, unsigned long size, | |
| 255 | + unsigned long flags) | |
| 256 | 256 | { |
| 257 | - return (void *) offset; | |
| 257 | + return (void __iomem *) offset; | |
| 258 | 258 | } |
| 259 | 259 | |
| 260 | -static inline void *ioremap(unsigned long offset, unsigned long size) | |
| 260 | +static inline void __iomem *ioremap(unsigned long offset, unsigned long size) | |
| 261 | 261 | { |
| 262 | - return (void *) offset; | |
| 262 | + return (void __iomem *) offset; | |
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | /* |
| 266 | 266 | |
| 267 | 267 | |
| ... | ... | @@ -267,14 +267,14 @@ |
| 267 | 267 | * area. it's useful if some control registers are in such an area and write |
| 268 | 268 | * combining or read caching is not desirable: |
| 269 | 269 | */ |
| 270 | -static inline void *ioremap_nocache(unsigned long offset, unsigned long size) | |
| 270 | +static inline void __iomem *ioremap_nocache(unsigned long offset, unsigned long size) | |
| 271 | 271 | { |
| 272 | - return (void *) (offset | 0x20000000); | |
| 272 | + return (void __iomem *) (offset | 0x20000000); | |
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | #define ioremap_wc ioremap_nocache |
| 276 | 276 | |
| 277 | -static inline void iounmap(void *addr) | |
| 277 | +static inline void iounmap(void __iomem *addr) | |
| 278 | 278 | { |
| 279 | 279 | } |
| 280 | 280 |