diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-15 01:25:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-15 01:25:04 -0400 |
| commit | 5938930e71affa390c3fa33fa2fda52f58f850e8 (patch) | |
| tree | ab6d3745a56f3bd17e4693c3ca8ff4ead9e16978 /arch/powerpc/kernel/irq.c | |
| parent | f21afc25f9ed45b8ffe200d0f071b0caec3ed2ef (diff) | |
| parent | 230b3034793247f61e6a0b08c44cf415f6d92981 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt:
"So here are 3 fixes still for 3.10. Fixes are simple, bugs are nasty
(though not recent regressions, nasty enough) and all targeted at
stable"
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix missing/delayed calls to irq_work
powerpc: Fix emulation of illegal instructions on PowerNV platform
powerpc: Fix stack overflow crash in resume_kernel when ftracing
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
| -rw-r--r-- | arch/powerpc/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 5cbcf4d5a808..ea185e0b3cae 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
| @@ -162,7 +162,7 @@ notrace unsigned int __check_irq_replay(void) | |||
| 162 | * in case we also had a rollover while hard disabled | 162 | * in case we also had a rollover while hard disabled |
| 163 | */ | 163 | */ |
| 164 | local_paca->irq_happened &= ~PACA_IRQ_DEC; | 164 | local_paca->irq_happened &= ~PACA_IRQ_DEC; |
| 165 | if (decrementer_check_overflow()) | 165 | if ((happened & PACA_IRQ_DEC) || decrementer_check_overflow()) |
| 166 | return 0x900; | 166 | return 0x900; |
| 167 | 167 | ||
| 168 | /* Finally check if an external interrupt happened */ | 168 | /* Finally check if an external interrupt happened */ |