1 files changed, 8 insertions, 25 deletions

diff --git a/arch/m68k/platform/68000/entry.S b/arch/m68k/platform/68000/entry.S
index 7f91c2fde509..23ac054c6e1a 100644
--- a/arch/m68k/platform/68000/entry.S
+++ b/arch/m68k/platform/68000/entry.S
@@ -27,7 +27,6 @@
 .globl ret_from_exception
 .globl ret_from_signal
 .globl sys_call_table
-.globl ret_from_interrupt
 .globl bad_interrupt
 .globl inthandler1
 .globl inthandler2
@@ -137,7 +136,7 @@ inthandler1:
         movel   #65,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler2:
         SAVE_ALL_INT
@@ -148,7 +147,7 @@ inthandler2:
         movel   #66,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler3:
         SAVE_ALL_INT
@@ -159,7 +158,7 @@ inthandler3:
         movel   #67,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler4:
         SAVE_ALL_INT
@@ -170,7 +169,7 @@ inthandler4:
         movel   #68,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler5:
         SAVE_ALL_INT
@@ -181,7 +180,7 @@ inthandler5:
         movel   #69,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler6:
         SAVE_ALL_INT
@@ -192,7 +191,7 @@ inthandler6:
         movel   #70,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler7:
         SAVE_ALL_INT
@@ -203,7 +202,7 @@ inthandler7:
         movel   #71,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler:
         SAVE_ALL_INT
@@ -214,23 +213,7 @@ inthandler:
         movel   %d0,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
-
-ret_from_interrupt:
-        jeq     1f
-2:
-        RESTORE_ALL
-1:
-        moveb   %sp@(PT_OFF_SR), %d0
-        and     #7, %d0
-        jhi     2b
-
-        /* check if we need to do software interrupts */
-        jeq     ret_from_exception
-
-        pea     ret_from_exception
-        jra     do_softirq
-
+        bra     ret_from_exception
 
 /*
  * Handler for uninitialized and spurious interrupts.