summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2011-12-01 13:12:22 +0200
committerMichael S. Tsirkin <mst@redhat.com>2011-12-04 16:00:14 +0200
commit2ebf5d0d79087005e1042df2cd0f7594782746d8 (patch)
tree8e6a569934fad90c5751c81347fe7cf26943f420
parent5322418502be4696ebdef2ed164bbd0a348d4816 (diff)
downloadblackbird-op-linux-2ebf5d0d79087005e1042df2cd0f7594782746d8.tar.gz
blackbird-op-linux-2ebf5d0d79087005e1042df2cd0f7594782746d8.zip
mn10300: add missing __iomap markers
MN10300's *ioremap*() collection lacks __iomem markers. Fix that. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-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)
/*
* Change "struct page" to physical address.
*/
-static inline void *__ioremap(unsigned long offset, unsigned long size,
- unsigned long flags)
+static inline void __iomem *__ioremap(unsigned long offset, unsigned long size,
+ unsigned long flags)
{
- return (void *) offset;
+ return (void __iomem *) offset;
}
-static inline void *ioremap(unsigned long offset, unsigned long size)
+static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
{
- return (void *) offset;
+ return (void __iomem *) offset;
}
/*
@@ -267,14 +267,14 @@ static inline void *ioremap(unsigned long offset, unsigned long size)
* area. it's useful if some control registers are in such an area and write
* combining or read caching is not desirable:
*/
-static inline void *ioremap_nocache(unsigned long offset, unsigned long size)
+static inline void __iomem *ioremap_nocache(unsigned long offset, unsigned long size)
{
- return (void *) (offset | 0x20000000);
+ return (void __iomem *) (offset | 0x20000000);
}
#define ioremap_wc ioremap_nocache
-static inline void iounmap(void *addr)
+static inline void iounmap(void __iomem *addr)
{
}
OpenPOWER on IntegriCloud