aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2006-09-25 19:51:28 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-10-01 15:03:20 -0400
commitd8d64d6b29d331f1217c77999f5104fe68b0ef3a (patch)
tree0c8fc021cc17a0ce0c3e37c8912eda8d9a31aec2
parente480af09c49736848f749a43dff2c902104f6691 (diff)
[SERIAL] Magic SysRq SAK does nothing on serial consoles
Make sysrq-K work on serial console by passing in the tty. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--include/linux/serial_core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index f9fdf97506ea..de2e68159d96 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -415,7 +415,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch,
415#ifdef SUPPORT_SYSRQ 415#ifdef SUPPORT_SYSRQ
416 if (port->sysrq) { 416 if (port->sysrq) {
417 if (ch && time_before(jiffies, port->sysrq)) { 417 if (ch && time_before(jiffies, port->sysrq)) {
418 handle_sysrq(ch, regs, NULL); 418 handle_sysrq(ch, regs, port->info->tty);
419 port->sysrq = 0; 419 port->sysrq = 0;
420 return 1; 420 return 1;
421 } 421 }