Fix users of handle_sysrq()

PATCH New Erlend Aasland 1 participant 1 message Jul 29, 2002

Subsystems (5)

MIPS s390 Char and misc drivers SPARC + UltraSPARC (sparc/sparc64) +1 more subsystems

lore

Share & tools

lore

Erlend Aasland

author

2002-07-29 18:23 UTC #0 lore raw

PATCH 1/1 Fix users of handle_sysrq()

Hi,

Some weeks ago, handle_sysrq() lost a parameter. A few users of that function were not modified, so they were broken. This patch should fix them.

Affected files:
/arch/mips/au1000/common/serial.c
/arch/ppc/4xx_io/serial_sicc.c
/arch/ppc/8xx_io/uart.c
/drivers/s390/char/ctrlchar.c
/drivers/sbus/char/sunkbd.c
/drivers/tc/zs.c
/drivers/char/hvc_console.c

Applies to 2.5.29 and current bk.

Regards,
Erlend Aasland

arch/mips/au1000/common/serial.c +1 -1

diff -urN linux-2.5.29/arch/mips/au1000/common/serial.c linux-2.5.29-dirty/arch/mips/au1000/common/serial.c
@@ -433,7 +433,7 @@
 		if (break_pressed && info->line == sercons.index) {
 			if (ch != 0 &&
 			    time_before(jiffies, break_pressed + HZ*5)) {
-				handle_sysrq(ch, regs, NULL, NULL);
+				handle_sysrq(ch, regs, NULL);
 				break_pressed = 0;
 				goto ignore_char;
 			}

arch/ppc/4xx_io/serial_sicc.c +1 -1

diff -urN linux-2.5.29/arch/ppc/4xx_io/serial_sicc.c linux-2.5.29-dirty/arch/ppc/4xx_io/serial_sicc.c
@@ -462,7 +462,7 @@
 #ifdef SUPPORT_SYSRQ
         if (info->sysrq) {
             if (ch && time_before(jiffies, info->sysrq)) {
-                handle_sysrq(ch, regs, NULL, NULL);
+                handle_sysrq(ch, regs, NULL);
                 info->sysrq = 0;
                 goto ignore_char;
             }

arch/ppc/8xx_io/uart.c +1 -1

diff -urN linux-2.5.29/arch/ppc/8xx_io/uart.c linux-2.5.29-dirty/arch/ppc/8xx_io/uart.c
@@ -481,7 +481,7 @@
 			if (break_pressed && info->line == sercons.index) {
 				if (ch != 0 && time_before(jiffies, 
 							break_pressed + HZ*5)) {
-					handle_sysrq(ch, regs, NULL, NULL);
+					handle_sysrq(ch, regs, NULL);
 					break_pressed = 0;
 					goto ignore_char;
 				} else

drivers/s390/char/ctrlchar.c +1 -1

diff -urN linux-2.5.29/drivers/s390/char/ctrlchar.c linux-2.5.29-dirty/drivers/s390/char/ctrlchar.c
@@ -26,7 +26,7 @@
 
 static void
 ctrlchar_handle_sysrq(struct tty_struct *tty) {
-	handle_sysrq(ctrlchar_sysrq_key, NULL, NULL, tty);
+	handle_sysrq(ctrlchar_sysrq_key, NULL, tty);
 }
 #endif

drivers/sbus/char/sunkbd.c +1 -1

diff -urN linux-2.5.29/drivers/sbus/char/sunkbd.c linux-2.5.29-dirty/drivers/sbus/char/sunkbd.c
@@ -544,7 +544,7 @@
 #ifdef CONFIG_MAGIC_SYSRQ			/* Handle the SysRq hack */
 	if (l1a_state.l1_down) {
 		if (!up_flag)
-			handle_sysrq(sun_sysrq_xlate[keycode], pt_regs, kbd, tty);
+			handle_sysrq(sun_sysrq_xlate[keycode], pt_regs, tty);
 		goto out;
 	}
 #endif

drivers/tc/zs.c +1 -1

diff -urN linux-2.5.29/drivers/tc/zs.c linux-2.5.29-dirty/drivers/tc/zs.c
@@ -443,7 +443,7 @@
 		if (break_pressed && info->line == sercons.index) {
 			if (ch != 0 &&
 			    time_before(jiffies, break_pressed + HZ*5)) {
-				handle_sysrq(ch, regs, NULL, NULL);
+				handle_sysrq(ch, regs, NULL);
 				break_pressed = 0;
 				goto ignore_char;
 			}

drivers/char/hvc_console.c +1 -1

diff -urN linux-2.5.29/drivers/char/hvc_console.c linux-2.5.29-dirty/drivers/char/hvc_console.c
@@ -204,7 +204,7 @@
 					sysrq_pressed = 1;
 					continue;
 				} else if (sysrq_pressed) {
-					handle_sysrq(buf[i], NULL, NULL, tty);
+					handle_sysrq(buf[i], NULL, tty);
 					sysrq_pressed = 0;
 					continue;
 				}