diff options
author | Matthew Wilcox <matthew@wil.cx> | 2006-09-19 18:37:01 -0400 |
---|---|---|
committer | Matthew Wilcox <willy@parisc-linux.org> | 2006-10-04 08:50:26 -0400 |
commit | 01232e932988fcf6ad87be49f69e633dd652a46d (patch) | |
tree | fa940c1970082cec27776dbfd6be53dba3ddc6f0 | |
parent | 08a6436816f7a16113c73be767ee8d50440e494e (diff) |
[PARISC] Fix iounmap compile warning
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>
-rw-r--r-- | arch/parisc/mm/ioremap.c | 2 | ||||
-rw-r--r-- | include/asm-parisc/io.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c index 27384567a1d0..47a1d2ac9419 100644 --- a/arch/parisc/mm/ioremap.c +++ b/arch/parisc/mm/ioremap.c | |||
@@ -188,7 +188,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l | |||
188 | } | 188 | } |
189 | EXPORT_SYMBOL(__ioremap); | 189 | EXPORT_SYMBOL(__ioremap); |
190 | 190 | ||
191 | void iounmap(void __iomem *addr) | 191 | void iounmap(const volatile void __iomem *addr) |
192 | { | 192 | { |
193 | if (addr > high_memory) | 193 | if (addr > high_memory) |
194 | return vfree((void *) (PAGE_MASK & (unsigned long __force) addr)); | 194 | return vfree((void *) (PAGE_MASK & (unsigned long __force) addr)); |
diff --git a/include/asm-parisc/io.h b/include/asm-parisc/io.h index b9eb245b8874..c1963ce19dd2 100644 --- a/include/asm-parisc/io.h +++ b/include/asm-parisc/io.h | |||
@@ -134,7 +134,7 @@ extern inline void __iomem * ioremap(unsigned long offset, unsigned long size) | |||
134 | } | 134 | } |
135 | #define ioremap_nocache(off, sz) ioremap((off), (sz)) | 135 | #define ioremap_nocache(off, sz) ioremap((off), (sz)) |
136 | 136 | ||
137 | extern void iounmap(void __iomem *addr); | 137 | extern void iounmap(const volatile void __iomem *addr); |
138 | 138 | ||
139 | static inline unsigned char __raw_readb(const volatile void __iomem *addr) | 139 | static inline unsigned char __raw_readb(const volatile void __iomem *addr) |
140 | { | 140 | { |