[Linuxconsole-commit]CVS: ruby/linux/arch/ppc/xmon start.c,1.1,1.2

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

Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/xmon
In directory usw-pr-cvs1:/tmp/cvs-serv14367/linux/arch/ppc/xmon

Modified Files:
	start.c 
Log Message:
Synced to 2.5.15

Index: start.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/xmon/start.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- start.c	15 Mar 2002 18:28:11 -0000	1.1
+++ start.c	16 May 2002 18:01:38 -0000	1.2
@@ -32,6 +32,7 @@
 extern void xmon_printf(const char *fmt, ...);
 static int xmon_expect(const char *str, unsigned int timeout);
 
+static int use_serial;
 static int use_screen;
 static int via_modem;
 static int xmon_use_sccb;
@@ -95,6 +96,7 @@
 }
 #endif /* CONFIG_ALL_PPC */
 
+#ifdef CONFIG_MAGIC_SYSRQ
 static void sysrq_handle_xmon(int key, struct pt_regs *regs,
 			      struct tty_struct *tty)
 {
@@ -107,20 +109,20 @@
 	help_msg:	"Xmon",
 	action_msg:	"Entering xmon\n",
 };
+#endif
 
 void
 xmon_map_scc(void)
 {
 #ifdef CONFIG_ALL_PPC
 	volatile unsigned char *base;
-
-	use_screen = 0;
 	
 	if (_machine == _MACH_Pmac) {
 		struct device_node *np;
 		unsigned long addr;
 #ifdef CONFIG_BOOTX_TEXT
-		if (!machine_is_compatible("iMac")) {
+		if (!use_screen && !use_serial
+		    && !machine_is_compatible("iMac")) {
 			/* see if there is a keyboard in the device tree
 			   with a parent of type "adb" */
 			for (np = find_devices("keyboard"); np; np = np->next)
@@ -218,7 +220,9 @@
 	DLAB = 0x80;
 #endif /* platform */
 
+#ifdef CONFIG_MAGIC_SYSRQ
 	__sysrq_put_key_op('x', &sysrq_xmon_op);
+#endif
 }
 
 static int scc_initialized = 0;