diff options
| author | Walter T Gruczka <walter.t.gruczka@boeing.com> | 2008-02-14 19:31:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-14 20:58:05 -0800 |
| commit | 903be1c56444615342ac5f1fc103e2ec11043714 (patch) | |
| tree | 31dc02f5b62b32884e23020705771a7b73495840 /arch/m68knommu | |
| parent | b9cf92eda3ddaf025fc38323ff96bac34243dec8 (diff) | |
| download | kernel_samsung_smdk4412-903be1c56444615342ac5f1fc103e2ec11043714.zip kernel_samsung_smdk4412-903be1c56444615342ac5f1fc103e2ec11043714.tar.gz kernel_samsung_smdk4412-903be1c56444615342ac5f1fc103e2ec11043714.tar.bz2 | |
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')
| -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 b333731..111b66d 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 |