Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbab1c80 authored by Russell King's avatar Russell King
Browse files

ARM: entry: no need to check parent IRQ mask in IRQ handler return 



There's no point checking to see whether IRQs were masked in the parent
context when returning from IRQ handling - the fact that we're handling
an IRQ means that the parent context must have had IRQs unmasked.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1613cc11

arch/arm/kernel/entry-armv.S

+3 −2
Original line number Original line Diff line number Diff line
@@ -234,8 +234,9 @@ __irq_svc: 
#endif

#endif

	ldr	r4, [sp, #S_PSR]		@ irqs are already disabled

	ldr	r4, [sp, #S_PSR]		@ irqs are already disabled

#ifdef CONFIG_TRACE_IRQFLAGS

#ifdef CONFIG_TRACE_IRQFLAGS

	tst	r4, #PSR_I_BIT

	@ The parent context IRQs must have been enabled to get here in

	bleq	trace_hardirqs_on

	@ the first place, so there's no point checking the PSR I bit.

	bl	trace_hardirqs_on

#endif

#endif

	svc_exit r4				@ return from exception

	svc_exit r4				@ return from exception

 UNWIND(.fnend		)

 UNWIND(.fnend		)