diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-08 10:09:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-08 10:09:24 +1100 |
| commit | 81efb7364b99999902aca9343c225dd2f1a65170 (patch) | |
| tree | 2d484b3a50da1cc52ed6e16846e09e7496262b86 /arch | |
| parent | dea01a2f0276deb0204d4ebc06fb2c35c0626815 (diff) | |
| parent | 7680a920c75b242adaedf3d93b7f6d253db56792 (diff) | |
Merge commit 'm68knommu/for-next'
Diffstat (limited to 'arch')
| -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 |