X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fmips%2Fvr41xx%2Fcommon%2Firq.c;fp=arch%2Fmips%2Fvr41xx%2Fcommon%2Firq.c;h=61aa264275ff2883d0f1fbec5871645a307a5287;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=4733c5344467f1f0f441f9066ecc1ef684426f48;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
index 4733c5344..61aa26427 100644
--- a/arch/mips/vr41xx/common/irq.c
+++ b/arch/mips/vr41xx/common/irq.c
@@ -22,7 +22,7 @@
 
 #include <asm/irq_cpu.h>
 #include <asm/system.h>
-#include <asm/vr41xx/irq.h>
+#include <asm/vr41xx/vr41xx.h>
 
 typedef struct irq_cascade {
 	int (*get_irq)(unsigned int, struct pt_regs *);
@@ -59,10 +59,10 @@ int cascade_irq(unsigned int irq, int (*get_irq)(unsigned int, struct pt_regs *)
 
 EXPORT_SYMBOL_GPL(cascade_irq);
 
-static void irq_dispatch(unsigned int irq, struct pt_regs *regs)
+asmlinkage void irq_dispatch(unsigned int irq, struct pt_regs *regs)
 {
 	irq_cascade_t *cascade;
-	struct irq_desc *desc;
+	irq_desc_t *desc;
 
 	if (irq >= NR_IRQS) {
 		atomic_inc(&irq_err_count);
@@ -73,43 +73,22 @@ static void irq_dispatch(unsigned int irq, struct pt_regs *regs)
 	if (cascade->get_irq != NULL) {
 		unsigned int source_irq = irq;
 		desc = irq_desc + source_irq;
-		desc->chip->ack(source_irq);
+		desc->handler->ack(source_irq);
 		irq = cascade->get_irq(irq, regs);
 		if (irq < 0)
 			atomic_inc(&irq_err_count);
 		else
 			irq_dispatch(irq, regs);
-		desc->chip->end(source_irq);
+		desc->handler->end(source_irq);
 	} else
 		do_IRQ(irq, 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)
-		do_IRQ(7, regs);
-	else if (pending & 0x7800) {
-		if (pending & CAUSEF_IP3)
-			irq_dispatch(3, regs);
-		else if (pending & CAUSEF_IP4)
-			irq_dispatch(4, regs);
-		else if (pending & CAUSEF_IP5)
-			irq_dispatch(5, regs);
-		else if (pending & CAUSEF_IP6)
-			irq_dispatch(6, regs);
-	} else if (pending & CAUSEF_IP2)
-		irq_dispatch(2, regs);
-	else if (pending & CAUSEF_IP0)
-		do_IRQ(0, regs);
-	else if (pending & CAUSEF_IP1)
-		do_IRQ(1, regs);
-	else
-		spurious_interrupt(regs);
-}
+extern asmlinkage void vr41xx_handle_interrupt(void);
 
 void __init arch_init_irq(void)
 {
 	mips_cpu_irq_init(MIPS_CPU_IRQ_BASE);
+
+	set_except_vector(0, vr41xx_handle_interrupt);
 }