From e0550d3ec5f14a9f46af833cacd868936184045d Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 26 Jun 2011 12:47:08 +0100 Subject: [PATCH] --- yaml --- r: 258199 b: refs/heads/master c: 30891c90d81133179cc47eb77c30764a3b5dad5c h: refs/heads/master i: 258197: dbcd7954f8d1efcceeb1cd2980417fc4659dbf58 258195: eab6e2f42c2b863d75167113044873192cbe63f8 258191: 7de0b34dbc3dde9b29684fc96f9e6572f19a7822 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/entry-armv.S | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 71fce1c2cf6b..745282732d47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40f0b90a2f16f433f9afbfef4b7c312efb54e933 +refs/heads/master: 30891c90d81133179cc47eb77c30764a3b5dad5c diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/arch/arm/kernel/entry-armv.S index bbdd443b8055..fa02a22a4c4b 100644 --- a/trunk/arch/arm/kernel/entry-armv.S +++ b/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