diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2005-12-06 05:56:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-15 13:01:29 -0500 |
commit | a32972965e23471f0762a1136f80990ebf72406a (patch) | |
tree | 47064f7ccb8f49a671c3689c34d562a6ca164f6c | |
parent | e4fe342f932346a306f98f5401ad510b890c0a15 (diff) |
[PATCH] sun4c_memerr_reg __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/sparc/mm/sun4c.c | 2 | ||||
-rw-r--r-- | include/asm-sparc/memreg.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index 1d560390e282..731f19603cad 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c | |||
@@ -497,7 +497,7 @@ static void __init sun4c_probe_mmu(void) | |||
497 | patch_kernel_fault_handler(); | 497 | patch_kernel_fault_handler(); |
498 | } | 498 | } |
499 | 499 | ||
500 | volatile unsigned long *sun4c_memerr_reg = NULL; | 500 | volatile unsigned long __iomem *sun4c_memerr_reg = NULL; |
501 | 501 | ||
502 | void __init sun4c_probe_memerr_reg(void) | 502 | void __init sun4c_probe_memerr_reg(void) |
503 | { | 503 | { |
diff --git a/include/asm-sparc/memreg.h b/include/asm-sparc/memreg.h index c0498d3baf93..5fb95c828da6 100644 --- a/include/asm-sparc/memreg.h +++ b/include/asm-sparc/memreg.h | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | /* Memory parity error register with associated bit constants. */ | 37 | /* Memory parity error register with associated bit constants. */ |
38 | #ifndef __ASSEMBLY__ | 38 | #ifndef __ASSEMBLY__ |
39 | extern __volatile__ unsigned long *sun4c_memerr_reg; | 39 | extern __volatile__ unsigned long __iomem *sun4c_memerr_reg; |
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | #define SUN4C_MPE_ERROR 0x80 /* Parity error detected. (ro) */ | 42 | #define SUN4C_MPE_ERROR 0x80 /* Parity error detected. (ro) */ |