[LV-k25-commit] kernel-2.5/arch/vax/kernel cpu_ka43.c,1.21,1.22

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30844/arch/vax/kernel

Modified Files:
	cpu_ka43.c 
Log Message:
- __iomem for cpu_ka43.c


Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- cpu_ka43.c	20 Apr 2005 18:59:02 -0000	1.21
+++ cpu_ka43.c	25 Apr 2005 08:16:15 -0000	1.22
@@ -10,7 +10,7 @@
  *             Fixed the cache initializing, added the functions
  *             ka43_cache_disbale/enable/clear and moved some stuff around.
  *  atp jun 2001 - machine check implementation
- *  atp Jul 2001 - diagmem remap functions 
+ *  atp Jul 2001 - diagmem remap functions
  */
 
 #include <linux/types.h>	/* For NULL */
@@ -26,10 +26,10 @@
 #include <asm/tlbflush.h>
 #include <asm/ka43.h>
 #include <asm/clock.h>		/* For clock_init routines */
-#include <asm/bus/vsbus.h> 
+#include <asm/bus/vsbus.h>
 
 /* Internal CPU register space */
-static volatile struct ka43_cpu_regs *cpu_regs;
+static volatile struct ka43_cpu_regs __iomem *cpu_regs;
 
 /*
  * We keep the cache page remaps handy incase we want to reset the cache
@@ -38,8 +38,8 @@
  *
  * atp jun 01
  */
-static volatile unsigned int *ka43_ctag_addr;
-static volatile unsigned int *ka43_creg_addr;
+static volatile unsigned int __iomem *ka43_ctag_addr;
+static volatile unsigned int __iomem *ka43_creg_addr;
 
 #define MC43_MAX	19
 
@@ -135,13 +135,13 @@
 	cpu_regs = ioremap(KA43_CPU_BASE, KA43_CPU_SIZE);
 	ka43_creg_addr = ioremap(KA43_CH2_CREG, 1);
 	ka43_ctag_addr = ioremap(KA43_CT2_BASE, KA43_CT2_SIZE);
-	
+
 	/*
 	 * Disable parity on DMA and CPU memory accesses. Don't know what the
 	 * story is with this, but VMS seems do this, too...
 	 */
 	cpu_regs->parctl = 0;
-	
+
 	/*
 	 * Resetting the cache involves disabling it, then clear it and
 	 * enable again.
@@ -236,7 +236,7 @@
         .sid_mask = VAX_SID_FAMILY_MASK,
         .sid_match = VAX_RIGEL << VAX_SID_FAMILY_SHIFT,
         .sidex_addr = RIGEL_SIDEX_ADDR,
-        .sidex_mask = 0x00000000, /* don't care */
+        .sidex_mask = 0x00000000, /* Don't care */
         .sidex_match = 0x00000000,
 };