diff options
author | Paul Mackerras <paulus@samba.org> | 2006-10-09 21:47:07 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-09 21:47:07 -0400 |
commit | f583ffce1aac783fd16d5d75cd69ac5ebb8f4933 (patch) | |
tree | 4123e8827592ab83191c56bc331dc73c3e42c0a9 /arch/powerpc/xmon | |
parent | 81e859ac1eef300c1b2ff49a2f2da8ee4ce1e844 (diff) |
[POWERPC] Fix xmon IRQ handler for pt_regs removal
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/xmon')
-rw-r--r-- | arch/powerpc/xmon/xmon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 5a854f36383c..f56ffef4defa 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <asm/rtas.h> | 36 | #include <asm/rtas.h> |
37 | #include <asm/sstep.h> | 37 | #include <asm/sstep.h> |
38 | #include <asm/bug.h> | 38 | #include <asm/bug.h> |
39 | #include <asm/irq_regs.h> | ||
39 | 40 | ||
40 | #ifdef CONFIG_PPC64 | 41 | #ifdef CONFIG_PPC64 |
41 | #include <asm/hvcall.h> | 42 | #include <asm/hvcall.h> |
@@ -521,13 +522,12 @@ int xmon(struct pt_regs *excp) | |||
521 | } | 522 | } |
522 | EXPORT_SYMBOL(xmon); | 523 | EXPORT_SYMBOL(xmon); |
523 | 524 | ||
524 | irqreturn_t | 525 | irqreturn_t xmon_irq(int irq, void *d) |
525 | xmon_irq(int irq, void *d, struct pt_regs *regs) | ||
526 | { | 526 | { |
527 | unsigned long flags; | 527 | unsigned long flags; |
528 | local_irq_save(flags); | 528 | local_irq_save(flags); |
529 | printf("Keyboard interrupt\n"); | 529 | printf("Keyboard interrupt\n"); |
530 | xmon(regs); | 530 | xmon(get_irq_regs()); |
531 | local_irq_restore(flags); | 531 | local_irq_restore(flags); |
532 | return IRQ_HANDLED; | 532 | return IRQ_HANDLED; |
533 | } | 533 | } |