[Linuxconsole-commit]CVS: ruby/linux/drivers/char sysrq.c,1.24,1.25

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv31360

Modified Files:
	sysrq.c 
Log Message:
Synced to latest linus BK tree.

Index: sysrq.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/sysrq.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- sysrq.c	30 Oct 2002 17:30:19 -0000	1.24
+++ sysrq.c	1 Nov 2002 23:14:55 -0000	1.25
@@ -35,6 +35,10 @@
 
 #include <asm/ptrace.h>
 
+#ifdef CONFIG_VOYAGER
+#include <asm/voyager.h>
+#endif
+
 extern struct list_head super_blocks;
 
 /* Whether we react on sysrq keys or just ignore them */
@@ -59,13 +63,14 @@
 	action_msg:	"Changing Loglevel",
 };
 
+
 /* SAK sysrq handler */
 #ifdef CONFIG_VT
 static void sysrq_handle_SAK(int key, struct pt_regs *pt_regs,
 			     struct tty_struct *tty) 
 {
 	struct vc_data *vc = (struct vc_data *) tty->driver_data;
-
+	
 	if (tty)
 		do_SAK(tty);
 	if ((tty->driver.type == TTY_DRIVER_TYPE_CONSOLE) && vc)
@@ -318,6 +323,14 @@
 	action_msg:	"Terminate All Tasks",
 };
 
+#ifdef CONFIG_VOYAGER
+static struct sysrq_key_op sysrq_voyager_dump_op = {
+	handler:	voyager_dump,
+	help_msg:	"voyager",
+	action_msg:	"Dump Voyager Status\n",
+};
+#endif
+
 static void sysrq_handle_kill(int key, struct pt_regs *pt_regs,
 			      struct tty_struct *tty) 
 {
@@ -351,7 +364,11 @@
 		 it is handled specially on the sparc
 		 and will never arrive */
 /* b */	&sysrq_reboot_op,
+#ifdef CONFIG_VOYAGER
+/* c */ &sysrq_voyager_dump_op,
+#else
 /* c */	NULL,
+#endif
 /* d */	NULL,
 /* e */	&sysrq_term_op,
 /* f */	NULL,