|
@@ -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)
|
|
|
{
|
|
|
}
|
|
|
|