---

yaml
---
r: 258199
b: refs/heads/master
c: 30891c9
h: refs/heads/master
i:
  258197: dbcd795
  258195: eab6e2f
  258191: 7de0b34
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40f0b90a2f16f433f9afbfef4b7c312efb54e933
+refs/heads/master: 30891c90d81133179cc47eb77c30764a3b5dad5c

trunk/arch/arm/kernel/entry-armv.S

@@ -195,10 +195,6 @@ __dabt_svc:
 	@
 	disable_irq_notrace
 
-	@
-	@ restore SPSR and restart the instruction
-	@
-	ldr	r5, [sp, #S_PSR]
 #ifdef CONFIG_TRACE_IRQFLAGS
 	tst	r5, #PSR_I_BIT
 	bleq	trace_hardirqs_on
@@ -223,7 +219,7 @@ __irq_svc:
 	tst	r0, #_TIF_NEED_RESCHED
 	blne	svc_preempt
 #endif
-	ldr	r5, [sp, #S_PSR]
+
 #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.
@@ -308,10 +304,6 @@ __pabt_svc:
 	@
 	disable_irq_notrace
 
-	@
-	@ restore SPSR and restart the instruction
-	@
-	ldr	r5, [sp, #S_PSR]
 #ifdef CONFIG_TRACE_IRQFLAGS
 	tst	r5, #PSR_I_BIT
 	bleq	trace_hardirqs_on