]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
m68knommu: fix coldfire interrupt exit path
authorWalter T Gruczka <walter.t.gruczka@boeing.com>
Fri, 15 Feb 2008 03:31:24 +0000 (19:31 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Feb 2008 04:58:05 +0000 (20:58 -0800)
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>
arch/m68knommu/platform/coldfire/entry.S

index b333731b875a81de24c5ea29fee216a0c75bcfbb..111b66dc737ba5f15e0d2af56b7a85e2db676050 100644 (file)
@@ -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