On Thu, Jan 31, 2019 at 06:23:37PM +0000, Valentin Schneider wrote: > 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. > > Reported-by: Julien Thierry <[email protected]> > Reported-by: Will Deacon <[email protected]> > Signed-off-by: Valentin Schneider <[email protected]> > Cc: Catalin Marinas <[email protected]> > Cc: Will Deacon <[email protected]> > Cc: Mark Rutland <[email protected]> > Cc: Marc Zyngier <[email protected]> > Cc: Julien Grall <[email protected]> > Cc: Julien Thierry <[email protected]> > Cc: Thomas Gleixner <[email protected]> > Cc: [email protected] > --- > arch/arm64/kernel/entry.S | 11 +---------- > 1 file changed, 1 insertion(+), 10 deletions(-) > > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S > index 0ec0c46b2c0c..4d0c81f29a60 100644 > --- a/arch/arm64/kernel/entry.S > +++ b/arch/arm64/kernel/entry.S > @@ -611,7 +611,7 @@ el1_irq: > #ifdef CONFIG_PREEMPT > ldr x24, [tsk, #TSK_TI_PREEMPT] // get preempt count > cbnz x24, 1f // preempt count != 0 > - bl el1_preempt > + bl preempt_schedule_irq // irq en/disable is done inside > 1: > #endif > #ifdef CONFIG_TRACE_IRQFLAGS > @@ -620,15 +620,6 @@ el1_irq: > kernel_exit 1 > ENDPROC(el1_irq) > > -#ifdef CONFIG_PREEMPT > -el1_preempt: > - mov x24, lr > -1: bl preempt_schedule_irq // irq en/disable is done inside > - ldr x0, [tsk, #TSK_TI_FLAGS] // get new tasks TI_FLAGS > - tbnz x0, #TIF_NEED_RESCHED, 1b // needs rescheduling? > - ret x24 > -#endif > -
Acked-by: Will Deacon <[email protected]> Catalin can pick this up for 5.1. Will
