aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-10-10 11:47:07 +1000
committerPaul Mackerras <paulus@samba.org>2006-10-10 11:47:07 +1000
commitf583ffce1aac783fd16d5d75cd69ac5ebb8f4933 (patch)
tree4123e8827592ab83191c56bc331dc73c3e42c0a9
parent81e859ac1eef300c1b2ff49a2f2da8ee4ce1e844 (diff)
downloadkernel_samsung_tuna-f583ffce1aac783fd16d5d75cd69ac5ebb8f4933.zip
kernel_samsung_tuna-f583ffce1aac783fd16d5d75cd69ac5ebb8f4933.tar.gz
kernel_samsung_tuna-f583ffce1aac783fd16d5d75cd69ac5ebb8f4933.tar.bz2
[POWERPC] Fix xmon IRQ handler for pt_regs removal
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/xmon/xmon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 5a854f3..f56ffef 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -36,6 +36,7 @@
#include <asm/rtas.h>
#include <asm/sstep.h>
#include <asm/bug.h>
+#include <asm/irq_regs.h>
#ifdef CONFIG_PPC64
#include <asm/hvcall.h>
@@ -521,13 +522,12 @@ int xmon(struct pt_regs *excp)
}
EXPORT_SYMBOL(xmon);
-irqreturn_t
-xmon_irq(int irq, void *d, struct pt_regs *regs)
+irqreturn_t xmon_irq(int irq, void *d)
{
unsigned long flags;
local_irq_save(flags);
printf("Keyboard interrupt\n");
- xmon(regs);
+ xmon(get_irq_regs());
local_irq_restore(flags);
return IRQ_HANDLED;
}