aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-10-08 19:15:27 -0400
committerRalf Baechle <ralf@linux-mips.org>2006-10-08 19:15:27 -0400
commitb104189c203a47219e51ab179e50fd0c73ccea3b (patch)
tree37025eb149191f2694cd904264087bf3074772d3
parente24bb60e11e3fe9858b71874a4ac59333adbc4fc (diff)
handle_sysrq lost its pt_regs * argument
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/ppc/4xx_io/serial_sicc.c2
-rw-r--r--arch/um/drivers/mconsole_kern.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/4xx_io/serial_sicc.c b/arch/ppc/4xx_io/serial_sicc.c
index 87fe9a89dba7..080a20531f8b 100644
--- a/arch/ppc/4xx_io/serial_sicc.c
+++ b/arch/ppc/4xx_io/serial_sicc.c
@@ -441,7 +441,7 @@ siccuart_rx_chars(struct SICC_info *info, struct pt_regs *regs)
441#ifdef SUPPORT_SYSRQ 441#ifdef SUPPORT_SYSRQ
442 if (info->sysrq) { 442 if (info->sysrq) {
443 if (ch && time_before(jiffies, info->sysrq)) { 443 if (ch && time_before(jiffies, info->sysrq)) {
444 handle_sysrq(ch, regs, NULL); 444 handle_sysrq(ch, NULL);
445 info->sysrq = 0; 445 info->sysrq = 0;
446 goto ignore_char; 446 goto ignore_char;
447 } 447 }
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index a67dcbd78de4..8568abff66b4 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -675,7 +675,7 @@ static void sysrq_proc(void *arg)
675{ 675{
676 char *op = arg; 676 char *op = arg;
677 677
678 handle_sysrq(*op, &current->thread.regs, NULL); 678 handle_sysrq(*op, NULL);
679} 679}
680 680
681void mconsole_sysrq(struct mc_request *req) 681void mconsole_sysrq(struct mc_request *req)