aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mn10300/include/asm/io.h
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2011-12-01 06:12:22 -0500
committerMichael S. Tsirkin <mst@redhat.com>2011-12-04 09:00:14 -0500
commit2ebf5d0d79087005e1042df2cd0f7594782746d8 (patch)
tree8e6a569934fad90c5751c81347fe7cf26943f420 /arch/mn10300/include/asm/io.h
parent5322418502be4696ebdef2ed164bbd0a348d4816 (diff)
mn10300: add missing __iomap markers
MN10300's *ioremap*() collection lacks __iomem markers. Fix that. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'arch/mn10300/include/asm/io.h')
-rw-r--r--arch/mn10300/include/asm/io.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/mn10300/include/asm/io.h b/arch/mn10300/include/asm/io.h
index 787255da744e..0d6d54f09f17 100644
--- a/arch/mn10300/include/asm/io.h
+++ b/arch/mn10300/include/asm/io.h
@@ -251,15 +251,15 @@ static inline void *phys_to_virt(unsigned long address)
251/* 251/*
252 * Change "struct page" to physical address. 252 * Change "struct page" to physical address.
253 */ 253 */
254static inline void *__ioremap(unsigned long offset, unsigned long size, 254static inline void __iomem *__ioremap(unsigned long offset, unsigned long size,
255 unsigned long flags) 255 unsigned long flags)
256{ 256{
257 return (void *) offset; 257 return (void __iomem *) offset;
258} 258}
259 259
260static inline void *ioremap(unsigned long offset, unsigned long size) 260static 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/*
@@ -267,14 +267,14 @@ static inline void *ioremap(unsigned long offset, unsigned long size)
267 * area. it's useful if some control registers are in such an area and write 267 * area. it's useful if some control registers are in such an area and write
268 * combining or read caching is not desirable: 268 * combining or read caching is not desirable:
269 */ 269 */
270static inline void *ioremap_nocache(unsigned long offset, unsigned long size) 270static 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#define ioremap_wc ioremap_nocache 275#define ioremap_wc ioremap_nocache
276 276
277static inline void iounmap(void *addr) 277static inline void iounmap(void __iomem *addr)
278{ 278{
279} 279}
280 280