diff options
Diffstat (limited to 'arch/powerpc/xmon/xmon.c')
-rw-r--r-- | arch/powerpc/xmon/xmon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 708236f34746..f56ffef4defa 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
22 | #include <linux/sysrq.h> | 22 | #include <linux/sysrq.h> |
23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
24 | #include <linux/irq.h> | ||
24 | 25 | ||
25 | #include <asm/ptrace.h> | 26 | #include <asm/ptrace.h> |
26 | #include <asm/string.h> | 27 | #include <asm/string.h> |
@@ -35,6 +36,7 @@ | |||
35 | #include <asm/rtas.h> | 36 | #include <asm/rtas.h> |
36 | #include <asm/sstep.h> | 37 | #include <asm/sstep.h> |
37 | #include <asm/bug.h> | 38 | #include <asm/bug.h> |
39 | #include <asm/irq_regs.h> | ||
38 | 40 | ||
39 | #ifdef CONFIG_PPC64 | 41 | #ifdef CONFIG_PPC64 |
40 | #include <asm/hvcall.h> | 42 | #include <asm/hvcall.h> |
@@ -520,13 +522,12 @@ int xmon(struct pt_regs *excp) | |||
520 | } | 522 | } |
521 | EXPORT_SYMBOL(xmon); | 523 | EXPORT_SYMBOL(xmon); |
522 | 524 | ||
523 | irqreturn_t | 525 | irqreturn_t xmon_irq(int irq, void *d) |
524 | xmon_irq(int irq, void *d, struct pt_regs *regs) | ||
525 | { | 526 | { |
526 | unsigned long flags; | 527 | unsigned long flags; |
527 | local_irq_save(flags); | 528 | local_irq_save(flags); |
528 | printf("Keyboard interrupt\n"); | 529 | printf("Keyboard interrupt\n"); |
529 | xmon(regs); | 530 | xmon(get_irq_regs()); |
530 | local_irq_restore(flags); | 531 | local_irq_restore(flags); |
531 | return IRQ_HANDLED; | 532 | return IRQ_HANDLED; |
532 | } | 533 | } |
@@ -2577,12 +2578,11 @@ void xmon_init(int enable) | |||
2577 | } | 2578 | } |
2578 | 2579 | ||
2579 | #ifdef CONFIG_MAGIC_SYSRQ | 2580 | #ifdef CONFIG_MAGIC_SYSRQ |
2580 | static void sysrq_handle_xmon(int key, struct pt_regs *pt_regs, | 2581 | static void sysrq_handle_xmon(int key, struct tty_struct *tty) |
2581 | struct tty_struct *tty) | ||
2582 | { | 2582 | { |
2583 | /* ensure xmon is enabled */ | 2583 | /* ensure xmon is enabled */ |
2584 | xmon_init(1); | 2584 | xmon_init(1); |
2585 | debugger(pt_regs); | 2585 | debugger(get_irq_regs()); |
2586 | } | 2586 | } |
2587 | 2587 | ||
2588 | static struct sysrq_key_op sysrq_xmon_op = | 2588 | static struct sysrq_key_op sysrq_xmon_op = |