diff options
| author | William Lee Irwin III <wli@holomorphy.com> | 2005-01-01 17:48:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-01-01 17:48:00 -0800 |
| commit | 5929a03f130971bbea67d89760fc6087468693b2 (patch) | |
| tree | bf40b55ca04b90f43221aa8304b4801754ec85c2 /include | |
| parent | 427c1506dc54c431e5122aa563d642d7b87cfcca (diff) | |
[PATCH] sparc32: arch/sparc/kernel/pcic.c iomem annotations
arch/sparc/kernel/pcic.c trips numerous warnings due to iomem
annotations. This patch adds various needed iomem annotations.
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/io.h | 12 | ||||
| -rw-r--r-- | include/asm-sparc/pcic.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-sparc/io.h b/include/asm-sparc/io.h index 529dc9373631..3f8b9924a9b6 100644 --- a/include/asm-sparc/io.h +++ b/include/asm-sparc/io.h @@ -134,12 +134,12 @@ static inline void __writel(u32 l, volatile void __iomem *addr) #define inl_p(__addr) inl(__addr) #define outl_p(__l, __addr) outl(__l, __addr) -extern void outsb(unsigned long addr, const void *src, unsigned long cnt); -extern void outsw(unsigned long addr, const void *src, unsigned long cnt); -extern void outsl(unsigned long addr, const void *src, unsigned long cnt); -extern void insb(unsigned long addr, void *dst, unsigned long count); -extern void insw(unsigned long addr, void *dst, unsigned long count); -extern void insl(unsigned long addr, void *dst, unsigned long count); +void outsb(void * __iomem addr, const void *src, unsigned long cnt); +void outsw(void * __iomem addr, const void *src, unsigned long cnt); +void outsl(void * __iomem addr, const void *src, unsigned long cnt); +void insb(void * __iomem addr, void *dst, unsigned long count); +void insw(void * __iomem addr, void *dst, unsigned long count); +void insl(void * __iomem addr, void *dst, unsigned long count); #define IO_SPACE_LIMIT 0xffffffff diff --git a/include/asm-sparc/pcic.h b/include/asm-sparc/pcic.h index 471f05a0109b..301ae8022ddd 100644 --- a/include/asm-sparc/pcic.h +++ b/include/asm-sparc/pcic.h @@ -16,10 +16,10 @@ #include <asm/pbm.h> struct linux_pcic { - unsigned long pcic_regs; + void * __iomem pcic_regs; unsigned long pcic_io; - unsigned long pcic_config_space_addr; - unsigned long pcic_config_space_data; + void * __iomem pcic_config_space_addr; + void * __iomem pcic_config_space_data; struct resource pcic_res_regs; struct resource pcic_res_io; struct resource pcic_res_cfg_addr; |