Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux

[linux-2.6-microblaze.git] / arch / powerpc / include / asm / plpar_wrappers.h

diff --git a/arch/powerpc/include/asm/plpar_wrappers.h b/arch/powerpc/include/asm/plpar_wrappers.h
index 83e0f70..8239c0a 100644 (file)
--- 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);