Commit 13799748b957 ("powerpc/64: use interrupt restart table to speed
up return from interrupt") removed the inconditional clearing of MSR[RI]
when returning from interrupt into kernel. But powerpc/32 doesn't
implement interrupt restart table hence still need MSR[RI] to be
cleared.

Fixes: 13799748b957 ("powerpc/64: use interrupt restart table to speed up 
return from interrupt")
Signed-off-by: Christophe Leroy <[email protected]>
---
 arch/powerpc/kernel/interrupt.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c
index e0c681d0b076..e63bfde13e03 100644
--- a/arch/powerpc/kernel/interrupt.c
+++ b/arch/powerpc/kernel/interrupt.c
@@ -443,6 +443,9 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct 
pt_regs *regs)
 
                if (unlikely(stack_store))
                        __hard_EE_RI_disable();
+#else
+       } else {
+               __hard_EE_RI_disable();
 #endif /* CONFIG_PPC64 */
        }
 
-- 
2.49.0


Reply via email to