This branch is needed to allow preemptible IRQs to be scheduled,
otherwise the kernel hangs during boot on my e300 based platforms.
This branch is needed for both CONFIG_PREEMPT and CONFIG_PREEMPT_RT,
so broaden the check to CONFIG_PREEMPTION, which is selected by both.
This was previously set to CONFIG_PREEMPTION, but was reverted as part
of removing LAZY_PREEMPT support.
Fixes: b33022a48c79
Signed-off-by: Robert Joslyn <robert_joslyn@xxxxxxxxxx>
---
arch/powerpc/kernel/interrupt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c
index af62ec974b97..970039af8e92 100644
--- a/arch/powerpc/kernel/interrupt.c
+++ b/arch/powerpc/kernel/interrupt.c
@@ -396,7 +396,7 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs)
/* Returning to a kernel context with local irqs enabled. */
WARN_ON_ONCE(!(regs->msr & MSR_EE));
again:
- if (IS_ENABLED(CONFIG_PREEMPT)) {
+ if (IS_ENABLED(CONFIG_PREEMPTION)) {
/* Return to preemptible kernel context */
if (unlikely(read_thread_flags() & _TIF_NEED_RESCHED)) {
if (preempt_count() == 0)
--
2.45.2
