From: Russell King Date: Sat, 25 Jun 2011 15:57:50 +0000 (+0100) Subject: ARM: entry: no need to check parent IRQ mask in IRQ handler return X-Git-Tag: firefly_0821_release~3680^2~4950^2~1^3~15 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fbab1c809467efe001194ab8bb17f0f451a17f97;p=firefly-linux-kernel-4.4.55.git 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: Russell King --- diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 1e5f387c70ae..fd42e667a81b 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -234,8 +234,9 @@ __irq_svc: #endif ldr r4, [sp, #S_PSR] @ irqs are already disabled #ifdef CONFIG_TRACE_IRQFLAGS - tst r4, #PSR_I_BIT - bleq trace_hardirqs_on + @ The parent context IRQs must have been enabled to get here in + @ the first place, so there's no point checking the PSR I bit. + bl trace_hardirqs_on #endif svc_exit r4 @ return from exception UNWIND(.fnend )