dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

mn10300: add missing __iomap markers 

MN10300's *ioremap*() collection lacks __iomem markers.
Fix that.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2011-12-01 13:12:22 +02:00
parent 5322418502
commit 2ebf5d0d79
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/mn10300/include/asm/io.h
View File

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