From: Walter T Gruczka <walter.t.gruczka@boeing.com>
Date: Fri, 15 Feb 2008 03:31:24 +0000 (-0800)
Subject: m68knommu: fix coldfire interrupt exit path
X-Git-Tag: v2.6.25-rc2~39
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=903be1c56444615342ac5f1fc103e2ec11043714;p=linux-2.6-omap-h63xx.git

m68knommu: fix coldfire interrupt exit path

Remove bogus conditional jump in return from interrupt path.  Reorder the code
path now that is not there.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/m68knommu/platform/coldfire/entry.S b/arch/m68knommu/platform/coldfire/entry.S
index b333731b875..111b66dc737 100644
--- a/arch/m68knommu/platform/coldfire/entry.S
+++ b/arch/m68knommu/platform/coldfire/entry.S
@@ -197,14 +197,13 @@ ENTRY(fasthandler)
 	RESTORE_LOCAL
 
 ENTRY(ret_from_interrupt)
-	jeq	2f
-1:
-	RESTORE_ALL
-2:
 	moveb	%sp@(PT_SR),%d0
 	andl	#0x7,%d0
-	jhi	1b
+	jeq	1f
 
+	RESTORE_ALL
+
+1:
 	/* check if we need to do software interrupts */
 	movel	irq_stat+CPUSTAT_SOFTIRQ_PENDING,%d0
 	jeq	ret_from_exception