Commit 903be1c5 authored by Walter T Gruczka's avatar Walter T Gruczka Committed by Linus Torvalds
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b9cf92ed

arch/m68knommu/platform/coldfire/entry.S

+4 −5
Original line number Diff line number Diff line
@@ -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