Skip to content

Commit

Permalink
[PARISC] Fix iounmap compile warning
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthew Wilcox authored and Matthew Wilcox committed Oct 4, 2006
1 parent 08a6436 commit 01232e9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/parisc/mm/ioremap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion include/asm-parisc/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 01232e9

Please sign in to comment.