patch-2.4.0-test2 linux/arch/alpha/kernel/irq_alpha.c

• Lines: 20
• Date: Mon Jun 19 17:59:32 2000
• Orig file: v2.4.0-test1/linux/arch/alpha/kernel/irq_alpha.c
• Orig date: Sun Mar 19 18:35:30 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/alpha/kernel/irq_alpha.c linux/arch/alpha/kernel/irq_alpha.c
@@ -105,8 +105,18 @@
 void __init
 init_IRQ(void)
 {
-	alpha_mv.init_irq();
+	/* Uh, this really MUST come first, just in case
+	 * the platform init_irq() causes interrupts/mchecks
+	 * (as is the case with RAWHIDE, at least).
+	 */
 	wrent(entInt, 0);
+
+	alpha_mv.init_irq();
+
+	/* If we had wanted SRM console printk echoing early, undo it now. */
+	if (alpha_using_srm && srmcons_output) {
+		unregister_srm_console();
+	}
 }
 
 /*