diff options
| author | Anton Blanchard <anton@samba.org> | 2014-08-05 14:55:00 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-08-13 15:13:48 +1000 |
| commit | a71d64b4dc4067808549935583d984c7fc9ea647 (patch) | |
| tree | 8679cdc9688707feb94e24f19a7c848009f654c4 /arch/powerpc | |
| parent | 56758e3c3ca7e3d8960e0e8f881e80adf119f4fe (diff) | |
| download | linux-stable-a71d64b4dc4067808549935583d984c7fc9ea647.tar.gz linux-stable-a71d64b4dc4067808549935583d984c7fc9ea647.tar.bz2 linux-stable-a71d64b4dc4067808549935583d984c7fc9ea647.zip | |
powerpc: Hard disable interrupts in xmon
xmon only soft disables interrupts. This seems like a bad idea - we
certainly don't want decrementer and PMU exceptions going off when
we are debugging something inside xmon.
This issue was uncovered when the hard lockup detector went off
inside xmon. To ensure we wont get a spurious hard lockup warning,
I also call touch_nmi_watchdog() when exiting xmon.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/xmon/xmon.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 8d198b5e9e0a..b988b5addf86 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -24,6 +24,7 @@ #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/bug.h> +#include <linux/nmi.h> #include <asm/ptrace.h> #include <asm/string.h> @@ -374,6 +375,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi) #endif local_irq_save(flags); + hard_irq_disable(); bp = in_breakpoint_table(regs->nip, &offset); if (bp != NULL) { @@ -558,6 +560,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi) #endif insert_cpu_bpts(); + touch_nmi_watchdog(); local_irq_restore(flags); return cmd != 'X' && cmd != EOF; |