1 files changed, 15 insertions, 12 deletions

diff --git a/arch/mips/gt64120/ev64120/irq.c b/arch/mips/gt64120/ev64120/irq.c
index 3b186159b21a..46c468b26b30 100644
--- a/arch/mips/gt64120/ev64120/irq.c
+++ b/arch/mips/gt64120/ev64120/irq.c
@@ -46,14 +46,22 @@
 #include <asm/system.h>
 #include <asm/gt64120.h>
 
-asmlinkage inline void pci_intA(struct pt_regs *regs)
+asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
 {
-        do_IRQ(GT_INTA, regs);
-}
-
-asmlinkage inline void pci_intD(struct pt_regs *regs)
-{
-        do_IRQ(GT_INTD, regs);
+        unsigned int pending = read_c0_status() & read_c0_cause();
+
+        if (pending & STATUSF_IP4)              /* int2 hardware line (timer) */
+                do_IRQ(4, regs);
+        else if (pending & STATUSF_IP2)         /* int0 hardware line */
+                do_IRQ(GT_INTA, regs);
+        else if (pending & STATUSF_IP5)         /* int3 hardware line */
+                do_IRQ(GT_INTD, regs);
+        else if (pending & STATUSF_IP6)         /* int4 hardware line */
+                do_IRQ(6, regs);
+        else if (pending & STATUSF_IP7)         /* compare int */
+                do_IRQ(7, regs);
+        else
+                spurious_interrupt(regs);
 }
 
 static void disable_ev64120_irq(unsigned int irq_nr)
@@ -109,16 +117,11 @@ static struct hw_interrupt_type ev64120_irq_type = {
 
 void gt64120_irq_setup(void)
 {
-        extern asmlinkage void galileo_handle_int(void);
-
         /*
          * Clear all of the interrupts while we change the able around a bit.
          */
         clear_c0_status(ST0_IM);
 
-        /* Sets the exception_handler array. */
-        set_except_vector(0, galileo_handle_int);
-
         local_irq_disable();
 
         /*