diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2006-11-06 01:24:48 +0300 |
|---|---|---|
| committer | Kyle McMartin <kyle@ubuntu.com> | 2006-12-08 08:34:34 +0300 |
| commit | e51ec241784f516ad3a916a24ac936364cd10d63 (patch) | |
| tree | 0eec46bdea7f7f642e995cd26c3625fdb0305d56 /arch/parisc/mm | |
| parent | c2c4798e04ef836b12f5df04e7d1a1710cb39301 (diff) | |
| download | linux-e51ec241784f516ad3a916a24ac936364cd10d63.tar.xz | |
[PARISC] more sparse fixes
0/NULL changes, __user annotations, __iomem annotations
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'arch/parisc/mm')
| -rw-r--r-- | arch/parisc/mm/ioremap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c index 47a1d2ac9419..6c6102307c06 100644 --- a/arch/parisc/mm/ioremap.c +++ b/arch/parisc/mm/ioremap.c @@ -128,7 +128,7 @@ remap_area_pages(unsigned long address, unsigned long phys_addr, */ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags) { - void *addr; + void __iomem *addr; struct vm_struct *area; unsigned long offset, last_addr; @@ -178,13 +178,13 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l if (!area) return NULL; - addr = area->addr; + addr = (void __iomem *) area->addr; if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) { vfree(addr); return NULL; } - return (void __iomem *) (offset + (char *)addr); + return (void __iomem *) (offset + (char __iomem *)addr); } EXPORT_SYMBOL(__ioremap); |