From 497ad860d9e27133e3b352fa68b3b1a1fefe7e60 Mon Sep 17 00:00:00 2001 From: Philippe Gerum Date: Mon, 22 Jun 2009 18:24:02 +0200 Subject: [PATCH] --- yaml --- r: 162677 b: refs/heads/master c: fc9afb997f3e871d1c289258d59b48db30984950 h: refs/heads/master i: 162675: 9a5f37798ca0c3e4664d83f2b2174d8e11ea14de v: v3 --- [refs] | 2 +- trunk/arch/blackfin/mach-common/interrupt.S | 24 +-------------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/[refs] b/[refs] index 05a6dc8efc45..54c0a0410157 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9703a73c983edab860d6d145c87480440fc83348 +refs/heads/master: fc9afb997f3e871d1c289258d59b48db30984950 diff --git a/trunk/arch/blackfin/mach-common/interrupt.S b/trunk/arch/blackfin/mach-common/interrupt.S index 9c46680186e4..ae7fc88ab6a0 100644 --- a/trunk/arch/blackfin/mach-common/interrupt.S +++ b/trunk/arch/blackfin/mach-common/interrupt.S @@ -276,33 +276,11 @@ ENTRY(___ipipe_call_irqtail) ( r7:4, p5:3 ) = [sp++]; rets = [sp++]; - [--sp] = reti; - reti = [sp++]; /* IRQs are off. */ - r0.h = 3f; - r0.l = 3f; - p0.l = lo(EVT14); - p0.h = hi(EVT14); - [p0] = r0; - csync; r0 = 0x401f (z); sti r0; - raise 14; - [--sp] = reti; /* IRQs on. */ + raise 14; /* Branches to _evt_evt14 */ 2: jump 2b; /* Likely paranoid. */ -3: - sp += 4; /* Discard saved RETI */ - r0.h = _evt14_softirq; - r0.l = _evt14_softirq; - p0.l = lo(EVT14); - p0.h = hi(EVT14); - [p0] = r0; - csync; - p0.l = _bfin_irq_flags; - p0.h = _bfin_irq_flags; - r0 = [p0]; - sti r0; - rts; ENDPROC(___ipipe_call_irqtail) #endif /* CONFIG_IPIPE */