diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2018-05-05 03:19:26 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-06-03 20:40:25 +1000 |
| commit | 9f4b61b2777dfd1692189ab3e38f8eb7dc669512 (patch) | |
| tree | 37135eaca6fdf787b8b1244a22cc3fb8f6eeff49 | |
| parent | ebb37cf3ffd39fdb6ec5b07111f8bb2f11d92c5f (diff) | |
| download | linux-9f4b61b2777dfd1692189ab3e38f8eb7dc669512.tar.gz linux-9f4b61b2777dfd1692189ab3e38f8eb7dc669512.tar.bz2 linux-9f4b61b2777dfd1692189ab3e38f8eb7dc669512.zip | |
powerpc/pseries: put cede MSR[EE] check under IRQ_SOFT_MASK_DEBUG
This check does not catch IRQ soft mask bugs, but this option is
slightly more suitable than TRACE_IRQFLAGS.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | arch/powerpc/include/asm/plpar_wrappers.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/plpar_wrappers.h b/arch/powerpc/include/asm/plpar_wrappers.h index 96c1a46acbd0..cff5a411e595 100644 --- a/arch/powerpc/include/asm/plpar_wrappers.h +++ b/arch/powerpc/include/asm/plpar_wrappers.h @@ -39,10 +39,10 @@ static inline long extended_cede_processor(unsigned long latency_hint) set_cede_latency_hint(latency_hint); rc = cede_processor(); -#ifdef CONFIG_TRACE_IRQFLAGS - /* Ensure that H_CEDE returns with IRQs on */ - if (WARN_ON(!(mfmsr() & MSR_EE))) - __hard_irq_enable(); +#ifdef CONFIG_PPC_IRQ_SOFT_MASK_DEBUG + /* Ensure that H_CEDE returns with IRQs on */ + if (WARN_ON(!(mfmsr() & MSR_EE))) + __hard_irq_enable(); #endif set_cede_latency_hint(old_latency_hint); |