3 files changed, 16 insertions, 38 deletions

diff --git a/arch/mips/galileo-boards/ev96100/Makefile b/arch/mips/galileo-boards/ev96100/Makefile
index 58c02f9db69d..cd868ec78cbc 100644
--- a/arch/mips/galileo-boards/ev96100/Makefile
+++ b/arch/mips/galileo-boards/ev96100/Makefile
@@ -6,4 +6,4 @@
 # Makefile for the Galileo EV96100 board.
 #
 
-obj-y           += init.o irq.o puts.o reset.o time.o int-handler.o setup.o
+obj-y           += init.o irq.o puts.o reset.o time.o setup.o
diff --git a/arch/mips/galileo-boards/ev96100/int-handler.S b/arch/mips/galileo-boards/ev96100/int-handler.S
deleted file mode 100644
index ff4d10a38859..000000000000
--- a/arch/mips/galileo-boards/ev96100/int-handler.S
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <asm/asm.h>
-#include <asm/mipsregs.h>
-#include <asm/regdef.h>
-#include <asm/stackframe.h>
-
-        .set    noat
-        .align  5
-
-NESTED(ev96100IRQ, PT_SIZE, sp)
-        SAVE_ALL
-        CLI                             # Important: mark KERNEL mode !
-
-        mfc0    t0, CP0_CAUSE           # get pending interrupts
-        mfc0    t1, CP0_STATUS          # get enabled interrupts
-        and     t0, t1                  # isolate allowed ones
-
-        # FIX ME add R7000 extensions
-        andi    t0,0xff00               # isolate pending bits
-        andi    a0, t0, CAUSEF_IP7
-        beq     a0, zero, 1f
-        move    a0, sp
-        jal     mips_timer_interrupt
-        j       ret_from_irq
-
-1:      beqz    t0, 3f                  # spurious interrupt
-
-        move    a0, t0
-        move    a1, sp
-        jal     ev96100_cpu_irq
-        j       ret_from_irq
-
-3:      j       spurious_interrupt
-        END(ev96100IRQ)
diff --git a/arch/mips/galileo-boards/ev96100/irq.c b/arch/mips/galileo-boards/ev96100/irq.c
index 97bf094da4fe..ee5d6720f23b 100644
--- a/arch/mips/galileo-boards/ev96100/irq.c
+++ b/arch/mips/galileo-boards/ev96100/irq.c
@@ -40,8 +40,6 @@
 #include <linux/interrupt.h>
 #include <asm/irq_cpu.h>
 
-extern asmlinkage void ev96100IRQ(void);
-
 static inline unsigned int ffz8(unsigned int word)
 {
         unsigned long k;
@@ -54,13 +52,26 @@ static inline unsigned int ffz8(unsigned int word)
         return k;
 }
 
-asmlinkage void ev96100_cpu_irq(unsigned int pendin)
+extern void mips_timer_interrupt(struct pt_regs *regs);
+
+asmlinkage void ev96100_cpu_irq(unsigned int pending, struct pt_regs *regs)
 {
         do_IRQ(ffz8(pending >> 8), regs);
 }
 
+asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
+{
+        unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
+
+        if (pending & CAUSEF_IP7)
+                mips_timer_interrupt(regs);
+        else if (pending)
+                ev96100_cpu_irq(pending, regs);
+        else
+                spurious_interrupt(regs);
+}
+
 void __init arch_init_irq(void)
 {
-        set_except_vector(0, ev96100IRQ);
         mips_cpu_irq_init(0);
 }