[LV-k25-commit] kernel-2.5/arch/vax/kernel clock.c,1.6,1.7 cpu_generic.c,1.13,1.14 cpu_ka48.c,1.8,1.9

[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-serv30302/kernel

Modified Files:
	clock.c cpu_generic.c cpu_ka48.c 
Log Message:
- Some more __iomem related stuff.


Index: clock.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/clock.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- clock.c	18 Sep 2004 23:06:33 -0000	1.6
+++ clock.c	25 Apr 2005 09:18:48 -0000	1.7
@@ -1,20 +1,20 @@
-/* arch/vax/kernel/clock.c 
+/* arch/vax/kernel/clock.c
  *
  * Copyright atp 2002. license: GPL
- * 
+ *
  * Routines to manipulate the real time clock on VAXen.
  *
- * There are two sorts of battery backed hardware clocks. There is the 
- * TODR (time of day register) found on big VAXen, and the familiar 
+ * There are two sorts of battery backed hardware clocks. There is the
+ * TODR (time of day register) found on big VAXen, and the familiar
  * Dallas CMOS clock on the desktop VAXen.
- * 
- * The init routines are called through the machine vector. See 
- * cpu_kaxx.c for details of that. The callers are time_init() and 
+ *
+ * The init routines are called through the machine vector. See
+ * cpu_kaxx.c for details of that. The callers are time_init() and
  * the rtc clock driver (drivers/char/rtc.c), using macros defined
  * in asm/mc146818rtc.h.
- * 
+ *
  * Prototypes for some of these functions are in asm/mc146818rtc.h
- * and some in asm/clock.h. (The ones that are used in the mv 
+ * and some in asm/clock.h. (The ones that are used in the mv
  * initialisation are in clock.h, and the ones used in mc146818rtc.h
  * are in that file).
  *
@@ -33,6 +33,7 @@
 /* this does nothing, and is a placeholder */
 void generic_clock_init(void)
 {
+	printk (KERN_WARN "No RTC used\n");
 	return;
 }
 

Index: cpu_generic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_generic.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cpu_generic.c	2 Oct 2004 18:38:37 -0000	1.13
+++ cpu_generic.c	25 Apr 2005 09:18:48 -0000	1.14
@@ -12,15 +12,15 @@
  */
 
 /*
- * Generic reboot and halt functions are in reboot.c 
+ * Generic reboot and halt functions are in reboot.c
  * CPUs that need to do special stuff in their halt and reboot functions
- * should point to their own functions in their machine vector, 
+ * should point to their own functions in their machine vector,
  * otherwise they can leave NULL in the machine vector slots for these
  * functions
  *
  * atp. This holds for machine check functions too. Leave a NULL if you
- *      just want a halt instruction on receipt of a machine check. 
- *      See VARM Chapter 5 for details on machine check frames. 
+ *      just want a halt instruction on receipt of a machine check.
+ *      See VARM Chapter 5 for details on machine check frames.
  */
 
 
@@ -79,7 +79,7 @@
 	: "g"(c)
 	: "r2");
 }
- 
+
 int ka46_48_49_prom_getchar(void)
 {
 	/* Not yet implemented */
@@ -107,12 +107,12 @@
 //#ifdef CONFIG_DZ
 /************************************************************************/
 /* These functions can be used by implementations that do console I/O
-   via a DZ11-compatible chip (KA410, KA42 and KA43 CPUs).  These functions can 
-   only be used after VM is enabled and the DZ11 registers have been 
+   via a DZ11-compatible chip (KA410, KA42 and KA43 CPUs).  These functions can
+   only be used after VM is enabled and the DZ11 registers have been
    mapped by map_dz11_regs(). */
 
 
-volatile struct dz11_regs *dz11_addr;
+volatile struct dz11_regs __iomem *dz11_addr;
 
 /* This is the serial line on the DZ11 that we should use as the
    console.  Normally it is line 3 */
@@ -122,7 +122,7 @@
 void dz11_putchar(int c)
 {
 	u_int txcs, txdb, done;
-	
+
 	txdb = txcs = done = 0;
 	txdb = (c & DZ11_TDR_DATA_MASK);
 
@@ -143,7 +143,7 @@
 	do {
 		txcs = (u_short) dz11_addr->csr;
 		if (txcs & DZ11_CSR_TRDY) {
-			/* We should really check that this TRDY is for 
+			/* We should really check that this TRDY is for
 			 * the correct line, and not one of the other lines */
 			dz11_addr->msr_tdr.tdr = (u_short) txdb;
 			done = 1;
@@ -173,7 +173,7 @@
 //#endif /* CONFIG_DZ */
 
 #ifdef CONFIG_CPU_VXT
-volatile int *vxt2694_addr = NULL;
+volatile int __iomem *vxt2694_addr = NULL;
 
 void
 vxt2694_putchar (int c)

Index: cpu_ka48.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka48.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cpu_ka48.c	2 Oct 2004 11:42:46 -0000	1.8
+++ cpu_ka48.c	25 Apr 2005 09:18:48 -0000	1.9
@@ -81,7 +81,7 @@
 static void ka48_dma_init(void)                                                                  
 {
 	int i;
-	unsigned int *base_addr;
+	unsigned int __iomem *base_addr;
 	unsigned long int *ka48_dmamap;
 
 	/*
@@ -107,7 +107,7 @@
 	iounmap(base_addr);
 
 	return;
-}                                                                                         
+}
 
 static void ka48_init_devices(void)
 {