ARM: entry: move disable_irq_notrace into svc_exit

All svc exit paths need IRQs off.  Rather than placing this before
every user of svc_exit, combine it into this macro.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 6 insertions, 0 deletions

diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 0bf15e5c40a2..57a1631f065a 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -76,12 +76,15 @@
 #ifndef CONFIG_THUMB2_KERNEL
         .macro  svc_exit, rpsr, irq = 0
         .if     \irq != 0
+        @ IRQs already off
 #ifdef CONFIG_TRACE_IRQFLAGS
         @ 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
         .else
+        @ IRQs off again before pulling preserved data off the stack
+        disable_irq_notrace
 #ifdef CONFIG_TRACE_IRQFLAGS
         tst     \rpsr, #PSR_I_BIT
         bleq    trace_hardirqs_on
@@ -136,12 +139,15 @@
 #else   /* CONFIG_THUMB2_KERNEL */
         .macro  svc_exit, rpsr, irq = 0
         .if     \irq != 0
+        @ IRQs already off
 #ifdef CONFIG_TRACE_IRQFLAGS
         @ 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
         .else
+        @ IRQs off again before pulling preserved data off the stack
+        disable_irq_notrace
 #ifdef CONFIG_TRACE_IRQFLAGS
         tst     \rpsr, #PSR_I_BIT
         bleq    trace_hardirqs_on