powerpc/entry: Remove unneeded need_resched() loop

Since the enabling and disabling of IRQs within preempt_schedule_irq()
is contained in a need_resched() loop, we don't need the outer arch
code loop.

Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
[mpe: Rebase since CURRENT_THREAD_INFO() removal]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 235a01d34b6d0b9e2df9a9e1ee2a4654f5acc211..c18f3490a77ecd147a6eacb3b5c62c38a37a0084 100644 (file)
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -906,10 +906,7 @@ resume_kernel:
         */
        bl      trace_hardirqs_off
 #endif
-1:     bl      preempt_schedule_irq
-       lwz     r3,TI_FLAGS(r2)
-       andi.   r0,r3,_TIF_NEED_RESCHED
-       bne-    1b
+       bl      preempt_schedule_irq
 #ifdef CONFIG_TRACE_IRQFLAGS
        /* And now, to properly rebalance the above, we tell lockdep they
         * are being turned back on, which will happen when we return

diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 7cc25389c6bd94263878b1453c3e28bfb44e870b..d978af78bf2af843da24db151ebb77b0402fa4f0 100644 (file)
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -865,13 +865,7 @@ resume_kernel:
         * sure we are soft-disabled first and reconcile irq state.
         */
        RECONCILE_IRQ_STATE(r3,r4)
-1:     bl      preempt_schedule_irq
-
-       /* Re-test flags and eventually loop */
-       ld      r9, PACA_THREAD_INFO(r13)
-       ld      r4,TI_FLAGS(r9)
-       andi.   r0,r4,_TIF_NEED_RESCHED
-       bne     1b
+       bl      preempt_schedule_irq
 
        /*
         * arch_local_irq_restore() from preempt_schedule_irq above may