patch-2.4.11-dontuse linux/arch/alpha/kernel/time.c

Next file: linux/arch/alpha/kernel/traps.c
Previous file: linux/arch/alpha/kernel/sys_cabriolet.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.10/linux/arch/alpha/kernel/time.c linux/arch/alpha/kernel/time.c
@@ -332,6 +332,21 @@
 	alpha_mv.init_rtc();
 
 	do_get_fast_time = do_gettimeofday;
+
+	/*
+	 * If we had wanted SRM console printk echoing early, undo it now.
+	 *
+	 * "srmcons" specified in the boot command arguments allows us to
+	 * see kernel messages during the period of time before the true
+	 * console device is "registered" during console_init(). As of this
+	 * version (2.4.10), time_init() is the last Alpha-specific code
+	 * called before console_init(), so we put this "unregister" code
+	 * here to prevent schizophrenic console behavior later... ;-}
+	 */
+	if (alpha_using_srm && srmcons_output) {
+		unregister_srm_console();
+		srmcons_output = 0;
+	}
 }
 
 /*

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)