diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-02-01 20:53:26 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-01 20:53:26 +0300 |
| commit | de8696203e64f19ea26f8e096ac8a796e78216b3 (patch) | |
| tree | d932f2f04d6c81c75c5104ae86b1e5d47e6591e3 /arch/m68knommu/platform/coldfire/entry.S | |
| parent | 807a96cd0e5f5311e7f7a1030b43aab624cd7d9f (diff) | |
| parent | 0dc23d704874e892c3fb5f2c0e4dfbef3c9c6edf (diff) | |
| download | linux-de8696203e64f19ea26f8e096ac8a796e78216b3.tar.xz | |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/m68knommu/platform/coldfire/entry.S')
| -rw-r--r-- | arch/m68knommu/platform/coldfire/entry.S | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/m68knommu/platform/coldfire/entry.S b/arch/m68knommu/platform/coldfire/entry.S index 1e3c0dcbd7ac..3b471c0da24a 100644 --- a/arch/m68knommu/platform/coldfire/entry.S +++ b/arch/m68knommu/platform/coldfire/entry.S @@ -215,19 +215,8 @@ ENTRY(fasthandler) RESTORE_LOCAL ENTRY(ret_from_interrupt) - moveb %sp@(PT_SR),%d0 - andl #0x7,%d0 - jeq 1f - - RESTORE_ALL - -1: - /* check if we need to do software interrupts */ - movel irq_stat+CPUSTAT_SOFTIRQ_PENDING,%d0 - jeq ret_from_exception - - pea ret_from_exception - jmp do_softirq + /* the fasthandler is confusing me, haven't seen any user */ + jmp ret_from_exception /* * Beware - when entering resume, prev (the current task) is |