Skip to content

Commit

Permalink
[PATCH] sun4c_memerr_reg __iomem annotations
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Dec 15, 2005
1 parent e4fe342 commit a329729
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/sparc/mm/sun4c.c
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ static void __init sun4c_probe_mmu(void)
patch_kernel_fault_handler();
}

volatile unsigned long *sun4c_memerr_reg = NULL;
volatile unsigned long __iomem *sun4c_memerr_reg = NULL;

void __init sun4c_probe_memerr_reg(void)
{
Expand Down
2 changes: 1 addition & 1 deletion include/asm-sparc/memreg.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

/* Memory parity error register with associated bit constants. */
#ifndef __ASSEMBLY__
extern __volatile__ unsigned long *sun4c_memerr_reg;
extern __volatile__ unsigned long __iomem *sun4c_memerr_reg;
#endif

#define SUN4C_MPE_ERROR 0x80 /* Parity error detected. (ro) */
Expand Down

0 comments on commit a329729

Please sign in to comment.