[LV-k25-commit] kernel-2.5/arch/vax/kernel early_printk.c,1.3,1.4

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

Modified Files:
	early_printk.c 
Log Message:
- Don't disable early console if machine vector says it's still needed.


Index: early_printk.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/early_printk.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- early_printk.c	24 May 2004 20:31:27 -0000	1.3
+++ early_printk.c	4 Oct 2004 06:55:26 -0000	1.4
@@ -14,9 +14,9 @@
 #include <linux/init.h>
 #include <asm/mv.h>
 
-static int __initdata early_console_enabled;
+static int early_console_enabled;
 
-static void __init early_console_write(struct console *cons, const char *p,
+static void early_console_write(struct console *cons, const char *p,
 		unsigned int len)
 {
 	while (len--) {
@@ -27,7 +27,7 @@
 	}
 }
 
-struct console __initdata early_console = {
+struct console early_console = {
 	.name	= "VAXcons",
 	.write	= early_console_write,
 	.flags	= CON_PRINTBUFFER,
@@ -48,9 +48,14 @@
 void __init disable_early_printk(void)
 {
 	if (early_console_enabled) {
-		printk("Disabling early console\n");
-		unregister_console(&early_console);
-		early_console_enabled = 0;
+		if (mv->keep_early_console)
+			printk (KERN_WARN "Not disabling early console "
+					"because it's still needed!\n");
+		else {
+			printk (KERN_INFO "Disabling early console\n");
+			unregister_console(&early_console);
+			early_console_enabled = 0;
+		}
 	}
 }