[patch] 2.4.0-test6-pre8: Magic SysRq fixes for serial.c

From: Maciej W. Rozycki (macro@ds2.pg.gda.pl)
Date: Wed Aug 09 2000 - 04:48:45 EST

Linus,

 It appears that someone else's fixes for magic SysRq went into
2.4.0-test6-pre*. That's obviously fine, but one hunk of my patch I've
sent you recently should still be applied. Without the hunk, the 8250
serial console driver still ignores the setting of sysrq_enabled and works
as if it was enabled all the time.

 Following is the hunk extracted from my patch. It applies cleanly.

  Maciej 

-- 
+  Maciej W. Rozycki, Technical University of Gdansk, Poland   +
+--------------------------------------------------------------+
+        e-mail: macro@ds2.pg.gda.pl, PGP key available        +

diff -u --recursive --new-file linux-mips-2.4.0-test5-20000731.macro/drivers/char/serial.c linux-mips-2.4.0-test5-20000731/drivers/char/serial.c
--- linux-mips-2.4.0-test5-20000731.macro/drivers/char/serial.c	Mon Jul 24 04:26:06 2000
+++ linux-mips-2.4.0-test5-20000731/drivers/char/serial.c	Sun Aug  6 09:21:03 2000
@@ -597,7 +597,8 @@
 				printk("handling break....");
 #endif
 #if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && !defined(MODULE)
-				if (info->line == sercons.index) {
+				if (info->line == sercons.index
+				    && sysrq_enabled) {
 					if (!break_pressed) {
 						break_pressed = jiffies;
 						goto ignore_char;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Tue Aug 15 2000 - 21:00:18 EST