Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=903be1c56444615342ac5f1fc103e2ec11043714
Commit: 903be1c56444615342ac5f1fc103e2ec11043714
Parent: b9cf92eda3ddaf025fc38323ff96bac34243dec8
Author: Walter T Gruczka <[EMAIL PROTECTED]>
AuthorDate: Thu Feb 14 19:31:24 2008 -0800
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Feb 14 20:58:05 2008 -0800
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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
