patch-2.2.14 linux/kernel/panic.c

Next file: linux/kernel/sched.c
Previous file: linux/kernel/ksyms.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.13/linux/kernel/panic.c linux/kernel/panic.c
@@ -74,11 +74,19 @@
 		machine_restart(NULL);
 	}
 #ifdef __sparc__
-	printk("Press L1-A to return to the boot prom\n");
+	{
+		extern int stop_a_enabled;
+		/* Make sure the user can actually press L1-A */
+		stop_a_enabled = 1;
+		printk("Press L1-A to return to the boot prom\n");
+	}
 #endif
 #ifdef __alpha__
 	if (alpha_using_srm)
 		halt();
+#endif
+#ifdef CONFIG_ARCH_S390
+        disabled_wait(0x1234);
 #endif
 	sti();
 	for(;;) {

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