[LV-k25-commit] kernel-2.5/arch/vax/kernel cpu_generic.c,1.14,1.15

[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-serv19892

Modified Files:
	cpu_generic.c 
Log Message:
- Don't access device registers while they're not yet mapped.


Index: cpu_generic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_generic.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cpu_generic.c	25 Apr 2005 09:18:48 -0000	1.14
+++ cpu_generic.c	21 May 2005 10:00:11 -0000	1.15
@@ -118,11 +118,21 @@
    console.  Normally it is line 3 */
 static unsigned int dz11_line;
 
-/* stuff a char out of a DZ11-compatible serial chip */
+/*
+ * Stuff a char out of a DZ11-compatible serial chip
+ */
 void dz11_putchar(int c)
 {
 	u_int txcs, txdb, done;
 
+	/*
+	 * During early startup, there might be a printk() call inside
+	 * ioremap(), which will be executed while ioremap() hasn't
+	 * finished, so the VM addr isn't yet set...
+	 */
+	if (!dz11_addr)
+		return;
+
 	txdb = txcs = done = 0;
 	txdb = (c & DZ11_TDR_DATA_MASK);