[Linuxconsole-commit]CVS: ruby/linux/kernel printk.c,1.28,1.29

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv8328/linux/kernel

Modified Files:
	printk.c 
Log Message:
Synced to 2.5.9. Note some of the fb changes went into 2.5.9. Yeah :-)

Index: printk.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/kernel/printk.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- printk.c	22 Mar 2002 20:13:58 -0000	1.28
+++ printk.c	24 Apr 2002 18:56:51 -0000	1.29
@@ -40,6 +40,10 @@
 
 #define LOG_BUF_MASK	(LOG_BUF_LEN-1)
 
+#ifndef arch_consoles_callable
+#define arch_consoles_callable() (1)
+#endif
+
 /* printk's without a loglevel use this.. */
 #define DEFAULT_MESSAGE_LOGLEVEL 4 /* KERN_WARNING */
 
@@ -446,6 +450,12 @@
 	}
 	spin_unlock_irqrestore(&logbuf_lock, flags);
 
+	/*
+	 * On some architectures, the consoles are not usable
+	 * on secondary CPUs early in the boot process.
+	 */
+	if (!arch_consoles_callable()) goto out; 
+
 	spin_lock(&console_lock);
 	for (con = console_drivers; con; con = con->next) {
 		/*
@@ -462,6 +472,7 @@
 	}
 	con_start = log_end;	/* Flush all consoles */
 	spin_unlock(&console_lock);
+out:
 	return printed_len;
 }
 EXPORT_SYMBOL(printk);