aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-10-09 00:15:27 +0100
committerRalf Baechle <ralf@linux-mips.org>2006-10-09 00:15:27 +0100
commitb104189c203a47219e51ab179e50fd0c73ccea3b (patch)
tree37025eb149191f2694cd904264087bf3074772d3
parentRevert "[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ" (diff)
downloadlinux-dev-b104189c203a47219e51ab179e50fd0c73ccea3b.tar.xz
linux-dev-b104189c203a47219e51ab179e50fd0c73ccea3b.zip
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)
#ifdef SUPPORT_SYSRQ
if (info->sysrq) {
if (ch && time_before(jiffies, info->sysrq)) {
- handle_sysrq(ch, regs, NULL);
+ handle_sysrq(ch, NULL);
info->sysrq = 0;
goto ignore_char;
}
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)
{
char *op = arg;
- handle_sysrq(*op, &current->thread.regs, NULL);
+ handle_sysrq(*op, NULL);
}
void mconsole_sysrq(struct mc_request *req)