]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[PARISC] Fix iounmap compile warning
authorMatthew Wilcox <matthew@wil.cx>
Tue, 19 Sep 2006 22:37:01 +0000 (16:37 -0600)
committerMatthew Wilcox <willy@parisc-linux.org>
Wed, 4 Oct 2006 12:50:26 +0000 (06:50 -0600)
iounmap's argument needs to be both const and volatile, otherwise we'll
get warnings that we're discarding pointer qualifiers

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
arch/parisc/mm/ioremap.c
include/asm-parisc/io.h

index 27384567a1d0a12e3719c7c9631c362e75e6636a..47a1d2ac941968086d089320ab86aaedb4f3c68f 100644 (file)
@@ -188,7 +188,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
 }
 EXPORT_SYMBOL(__ioremap);
 
-void iounmap(void __iomem *addr)
+void iounmap(const volatile void __iomem *addr)
 {
        if (addr > high_memory)
                return vfree((void *) (PAGE_MASK & (unsigned long __force) addr));
index b9eb245b88749f16ea144fac741942041f30dc27..c1963ce19dd26df0fa7fd3977a0f6592e769dae6 100644 (file)
@@ -134,7 +134,7 @@ extern inline void __iomem * ioremap(unsigned long offset, unsigned long size)
 }
 #define ioremap_nocache(off, sz)       ioremap((off), (sz))
 
-extern void iounmap(void __iomem *addr);
+extern void iounmap(const volatile void __iomem *addr);
 
 static inline unsigned char __raw_readb(const volatile void __iomem *addr)
 {