diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-10-19 14:21:47 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-10-19 17:55:14 +0100 |
| commit | d89e36d8df547fde2beaea82211954868da2282d (patch) | |
| tree | 43955607f4db78e5ddb0d6f84bac5121a8eae944 | |
| parent | d2bcf87d0fcdc10d1be65b03fd032bec05efe49f (diff) | |
| download | op-kernel-dev-d89e36d8df547fde2beaea82211954868da2282d.zip op-kernel-dev-d89e36d8df547fde2beaea82211954868da2282d.tar.gz | |
[MIPS] Fix iounmap argument to const volatile.
With the existing prototype the following code:
const void __iomem *io = ioremap();
x = readb(io);
iounmap(io);
did result in a warning.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/mm/ioremap.c | 2 | ||||
| -rw-r--r-- | include/asm-mips/io.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/mm/ioremap.c b/arch/mips/mm/ioremap.c index 3101d1d..cea7d0e 100644 --- a/arch/mips/mm/ioremap.c +++ b/arch/mips/mm/ioremap.c @@ -176,7 +176,7 @@ void __iomem * __ioremap(phys_t phys_addr, phys_t size, unsigned long flags) #define IS_KSEG1(addr) (((unsigned long)(addr) & ~0x1fffffffUL) == CKSEG1) -void __iounmap(volatile void __iomem *addr) +void __iounmap(const volatile void __iomem *addr) { struct vm_struct *p; diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h index c2d124b..bc5f3c5 100644 --- a/include/asm-mips/io.h +++ b/include/asm-mips/io.h @@ -172,7 +172,7 @@ extern unsigned long isa_slot_offset; #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) extern void __iomem * __ioremap(phys_t offset, phys_t size, unsigned long flags); -extern void __iounmap(volatile void __iomem *addr); +extern void __iounmap(const volatile void __iomem *addr); static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size, unsigned long flags) @@ -279,7 +279,7 @@ static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size, #define ioremap_uncached_accelerated(offset, size) \ __ioremap_mode((offset), (size), _CACHE_UNCACHED_ACCELERATED) -static inline void iounmap(volatile void __iomem *addr) +static inline void iounmap(const volatile void __iomem *addr) { #define __IS_KSEG1(addr) (((unsigned long)(addr) & ~0x1fffffffUL) == CKSEG1) |
