diff options
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 5 |
1 files changed, 3 insertions, 2 deletions
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: | |||
| 234 | #endif | 234 | #endif |
| 235 | ldr r4, [sp, #S_PSR] @ irqs are already disabled | 235 | ldr r4, [sp, #S_PSR] @ irqs are already disabled |
| 236 | #ifdef CONFIG_TRACE_IRQFLAGS | 236 | #ifdef CONFIG_TRACE_IRQFLAGS |
| 237 | tst r4, #PSR_I_BIT | 237 | @ The parent context IRQs must have been enabled to get here in |
| 238 | bleq trace_hardirqs_on | 238 | @ the first place, so there's no point checking the PSR I bit. |
| 239 | bl trace_hardirqs_on | ||
| 239 | #endif | 240 | #endif |
| 240 | svc_exit r4 @ return from exception | 241 | svc_exit r4 @ return from exception |
| 241 | UNWIND(.fnend ) | 242 | UNWIND(.fnend ) |