diff options
author | Walter T Gruczka <walter.t.gruczka@boeing.com> | 2008-02-14 22:31:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-14 23:58:05 -0500 |
commit | 903be1c56444615342ac5f1fc103e2ec11043714 (patch) | |
tree | 31dc02f5b62b32884e23020705771a7b73495840 /arch/m68knommu/platform | |
parent | b9cf92eda3ddaf025fc38323ff96bac34243dec8 (diff) |
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>
Diffstat (limited to 'arch/m68knommu/platform')
-rw-r--r-- | arch/m68knommu/platform/coldfire/entry.S | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/m68knommu/platform/coldfire/entry.S b/arch/m68knommu/platform/coldfire/entry.S index b333731b875a..111b66dc737b 100644 --- a/arch/m68knommu/platform/coldfire/entry.S +++ b/arch/m68knommu/platform/coldfire/entry.S | |||
@@ -197,14 +197,13 @@ ENTRY(fasthandler) | |||
197 | RESTORE_LOCAL | 197 | RESTORE_LOCAL |
198 | 198 | ||
199 | ENTRY(ret_from_interrupt) | 199 | ENTRY(ret_from_interrupt) |
200 | jeq 2f | ||
201 | 1: | ||
202 | RESTORE_ALL | ||
203 | 2: | ||
204 | moveb %sp@(PT_SR),%d0 | 200 | moveb %sp@(PT_SR),%d0 |
205 | andl #0x7,%d0 | 201 | andl #0x7,%d0 |
206 | jhi 1b | 202 | jeq 1f |
207 | 203 | ||
204 | RESTORE_ALL | ||
205 | |||
206 | 1: | ||
208 | /* check if we need to do software interrupts */ | 207 | /* check if we need to do software interrupts */ |
209 | movel irq_stat+CPUSTAT_SOFTIRQ_PENDING,%d0 | 208 | movel irq_stat+CPUSTAT_SOFTIRQ_PENDING,%d0 |
210 | jeq ret_from_exception | 209 | jeq ret_from_exception |