From c9a06cf0f55f506e277ccb25e56b072a0166e063 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Wed, 3 Nov 2010 16:21:05 +1000 Subject: [PATCH] --- yaml --- r: 231812 b: refs/heads/master c: fb670fb8aa637d92aeb53407aae0decd71c1bdee h: refs/heads/master v: v3 --- [refs] | 2 +- .../arch/m68knommu/platform/coldfire/entry.S | 28 +------------------ 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/[refs] b/[refs] index 2aad66a69298..5b23ce07a8c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57015421d3f3deafb1f6ccf03a6fe0539763dbee +refs/heads/master: fb670fb8aa637d92aeb53407aae0decd71c1bdee diff --git a/trunk/arch/m68knommu/platform/coldfire/entry.S b/trunk/arch/m68knommu/platform/coldfire/entry.S index 5e92bed94b7e..b9ce31966181 100644 --- a/trunk/arch/m68knommu/platform/coldfire/entry.S +++ b/trunk/arch/m68knommu/platform/coldfire/entry.S @@ -51,9 +51,7 @@ sw_usp: .globl ret_from_exception .globl ret_from_signal .globl sys_call_table -.globl ret_from_interrupt .globl inthandler -.globl fasthandler enosys: mov.l #sys_ni_syscall,%d3 @@ -192,31 +190,7 @@ ENTRY(inthandler) jbsr do_IRQ /* call high level irq handler */ lea %sp@(8),%sp /* pop args off stack */ - bra ret_from_interrupt /* this was fallthrough */ - -/* - * This is the fast interrupt handler (for certain hardware interrupt - * sources). Unlike the normal interrupt handler it just uses the - * current stack (doesn't care if it is user or kernel). It also - * doesn't bother doing the bottom half handlers. - */ -ENTRY(fasthandler) - SAVE_LOCAL - - movew %sp@(PT_OFF_FORMATVEC),%d0 - andl #0x03fc,%d0 /* mask out vector only */ - - movel %sp,%sp@- /* push regs arg */ - lsrl #2,%d0 /* calculate real vector # */ - movel %d0,%sp@- /* push vector number */ - jbsr do_IRQ /* call high level irq handler */ - lea %sp@(8),%sp /* pop args off stack */ - - RESTORE_LOCAL - -ENTRY(ret_from_interrupt) - /* the fasthandler is confusing me, haven't seen any user */ - jmp ret_from_exception + bra ret_from_exception /* * Beware - when entering resume, prev (the current task) is