diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2022-05-18 10:32:28 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-06-29 08:57:09 +0200 |
| commit | 78ffe6a7e2a169c4dcbbd08717a0a8d738659d15 (patch) | |
| tree | 2efe5253b281635f6eecd7d09376cf45fb08e9b5 /arch/powerpc/include/asm/plpar_wrappers.h | |
| parent | powerpc/irq: Don't open code irq_soft_mask helpers (diff) | |
| download | linux-78ffe6a7e2a169c4dcbbd08717a0a8d738659d15.tar.xz linux-78ffe6a7e2a169c4dcbbd08717a0a8d738659d15.zip | |
powerpc/irq: Replace #ifdefs by IS_ENABLED()
Replace
#ifdef CONFIG_PPC_IRQ_SOFT_MASK_DEBUG and
#ifdef CONFIG_PERF_EVENTS
by IS_ENABLED() in hw_irq.h and plpar_wrappers.h
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/c1ded642f8d9002767f8fed48ed6d1e76254ed73.1652862729.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc/include/asm/plpar_wrappers.h')
| -rw-r--r-- | arch/powerpc/include/asm/plpar_wrappers.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/plpar_wrappers.h b/arch/powerpc/include/asm/plpar_wrappers.h index 83e0f701ebc6..8239c0af5eb2 100644 --- a/arch/powerpc/include/asm/plpar_wrappers.h +++ b/arch/powerpc/include/asm/plpar_wrappers.h @@ -43,11 +43,10 @@ static inline long extended_cede_processor(unsigned long latency_hint) set_cede_latency_hint(latency_hint); rc = cede_processor(); -#ifdef CONFIG_PPC_IRQ_SOFT_MASK_DEBUG + /* Ensure that H_CEDE returns with IRQs on */ - if (WARN_ON(!(mfmsr() & MSR_EE))) + if (WARN_ON(IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG) && !(mfmsr() & MSR_EE))) __hard_irq_enable(); -#endif set_cede_latency_hint(old_latency_hint); |