From: Paul Mackerras <paulus@samba.org>
Date: Tue, 10 Oct 2006 01:47:07 +0000 (+1000)
Subject: [POWERPC] Fix xmon IRQ handler for pt_regs removal
X-Git-Tag: v2.6.19-rc2~144^2~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f583ffce1aac783fd16d5d75cd69ac5ebb8f4933;p=linux-2.6

[POWERPC] Fix xmon IRQ handler for pt_regs removal

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 5a854f3638..f56ffef4de 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;
 }