aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/hw_irq.h
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2013-05-09 22:09:41 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-05-10 17:01:09 +1000
commit4a3b8d0b833707811011ad14dd12dabf31fa690a (patch)
treee66e13b7f6687bc8e977b98197f15ae2ba95c907 /arch/powerpc/include/asm/hw_irq.h
parent73ed148aea9dc0508be7e30e7a447f55c1b2f378 (diff)
downloadlinaro-lsk-4a3b8d0b833707811011ad14dd12dabf31fa690a.tar.gz
powerpc: hard_irq_disable(): Call trace_hardirqs_off after disabling
lockdep.c has this: /* * So we're supposed to get called after you mask local IRQs, * but for some reason the hardware doesn't quite think you did * a proper job. */ if (DEBUG_LOCKS_WARN_ON(!irqs_disabled())) return; Since irqs_disabled() is based on soft_enabled(), that (not just the hard EE bit) needs to be 0 before we call trace_hardirqs_off. Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/include/asm/hw_irq.h')
-rw-r--r--arch/powerpc/include/asm/hw_irq.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index d615b28dda8..ba713f166fa 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -96,11 +96,12 @@ static inline bool arch_irqs_disabled(void)
#endif
#define hard_irq_disable() do { \
+ u8 _was_enabled = get_paca()->soft_enabled; \
__hard_irq_disable(); \
- if (local_paca->soft_enabled) \
- trace_hardirqs_off(); \
get_paca()->soft_enabled = 0; \
get_paca()->irq_happened |= PACA_IRQ_HARD_DIS; \
+ if (_was_enabled) \
+ trace_hardirqs_off(); \
} while(0)
static inline bool lazy_irq_pending(void)