patch-2.1.121 linux/kernel/panic.c

Next file: linux/lib/string.c
Previous file: linux/init/main.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.120/linux/kernel/panic.c linux/kernel/panic.c
@@ -19,6 +19,10 @@
 #include <linux/sysrq.h>
 #include <linux/interrupt.h>
 
+#ifdef __alpha__
+#include <asm/machvec.h>
+#endif
+
 asmlinkage void sys_sync(void);	/* it's really int */
 extern void unblank_console(void);
 extern int C_A_D;
@@ -70,9 +74,12 @@
 #ifdef __sparc__
 	printk("Press L1-A to return to the boot prom\n");
 #endif
+#ifdef __alpha__
+	if (alpha_using_srm)
+		halt();
+#endif
 	sti();
 	for(;;) {
 		CHECK_EMERGENCY_SYNC
 	}
 }
-

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov