diff options
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
| -rw-r--r-- | arch/powerpc/kernel/irq.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index c6c6f3b7f8cd..641da9e868ce 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
| @@ -229,6 +229,19 @@ notrace void arch_local_irq_restore(unsigned long en) | |||
| 229 | */ | 229 | */ |
| 230 | if (unlikely(irq_happened != PACA_IRQ_HARD_DIS)) | 230 | if (unlikely(irq_happened != PACA_IRQ_HARD_DIS)) |
| 231 | __hard_irq_disable(); | 231 | __hard_irq_disable(); |
| 232 | #ifdef CONFIG_TRACE_IRQFLAG | ||
| 233 | else { | ||
| 234 | /* | ||
| 235 | * We should already be hard disabled here. We had bugs | ||
| 236 | * where that wasn't the case so let's dbl check it and | ||
| 237 | * warn if we are wrong. Only do that when IRQ tracing | ||
| 238 | * is enabled as mfmsr() can be costly. | ||
| 239 | */ | ||
| 240 | if (WARN_ON(mfmsr() & MSR_EE)) | ||
| 241 | __hard_irq_disable(); | ||
| 242 | } | ||
| 243 | #endif /* CONFIG_TRACE_IRQFLAG */ | ||
| 244 | |||
| 232 | set_soft_enabled(0); | 245 | set_soft_enabled(0); |
| 233 | 246 | ||
| 234 | /* | 247 | /* |