From f30b07bda28fe73e8aa62fc75357a03a4f53a2d9 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 6 Dec 2005 05:56:39 -0500
Subject: [PATCH] --- yaml --- r: 15167 b: refs/heads/master c:
 a32972965e23471f0762a1136f80990ebf72406a h: refs/heads/master i:   15165:
 8fe0b422b769f713718d12c61428355928fd3285   15163:
 b041c219005a0d9fbfeab28ff48ad4759183c14a   15159:
 c912297e199842ad674ec065e7982e1de9deffe1   15151:
 16b96da6e2f239ca1c4206999abfc3e5a7ea3d3c   15135:
 7e372e937dce5c99286ab3bee22bb7d9d875a05a   15103:
 c64de43fd37c093c24cf8213078713178c63734b v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc/mm/sun4c.c      | 2 +-
 trunk/include/asm-sparc/memreg.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4564141341d5..dcfee32dabea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4fe342f932346a306f98f5401ad510b890c0a15
+refs/heads/master: a32972965e23471f0762a1136f80990ebf72406a
diff --git a/trunk/arch/sparc/mm/sun4c.c b/trunk/arch/sparc/mm/sun4c.c
index 1d560390e282..731f19603cad 100644
--- a/trunk/arch/sparc/mm/sun4c.c
+++ b/trunk/arch/sparc/mm/sun4c.c
@@ -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)
 {
diff --git a/trunk/include/asm-sparc/memreg.h b/trunk/include/asm-sparc/memreg.h
index c0498d3baf93..5fb95c828da6 100644
--- a/trunk/include/asm-sparc/memreg.h
+++ b/trunk/include/asm-sparc/memreg.h
@@ -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) */