Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / arch / mips / lasat / interrupt.c

diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
index 852a419..a144a00 100644 (file)
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
@@ -27,14 +27,13 @@
 #include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/lasat/lasatint.h>
+#include <asm/time.h>
 #include <asm/gdb-stub.h>
 
 static volatile int *lasat_int_status = NULL;
 static volatile int *lasat_int_mask = NULL;
 static volatile int lasat_int_mask_shift;
 
-extern asmlinkage void lasatIRQ(void);
-
 void disable_lasat_irq(unsigned int irq_nr)
 {
        unsigned long flags;
@@ -70,7 +69,7 @@ static void end_lasat_irq(unsigned int irq)
                enable_lasat_irq(irq);
 }
 
-static struct hw_interrupt_type lasat_irq_type = {
+static struct irq_chip lasat_irq_type = {
        .typename = "Lasat",
        .startup = startup_lasat_irq,
        .shutdown = shutdown_lasat_irq,
@@ -109,18 +108,24 @@ static unsigned long get_int_status_200(void)
        return int_status;
 }
 
-void lasat_hw0_irqdispatch(struct pt_regs *regs)
+asmlinkage void plat_irq_dispatch(void)
 {
        unsigned long int_status;
+       unsigned int cause = read_c0_cause();
        int irq;
 
+       if (cause & CAUSEF_IP7) {       /* R4000 count / compare IRQ */
+               ll_timer_interrupt(7);
+               return;
+       }
+
        int_status = get_int_status();
 
        /* if int_status == 0, then the interrupt has already been cleared */
        if (int_status) {
                irq = ls1bit32(int_status);
 
-               do_IRQ(irq, regs);
+               do_IRQ(irq);
        }
 }
 
@@ -147,13 +152,10 @@ void __init arch_init_irq(void)
                panic("arch_init_irq: mips_machtype incorrect");
        }
 
-       /* Now safe to set the exception vector. */
-       set_except_vector(0, lasatIRQ);
-
        for (i = 0; i <= LASATINT_END; i++) {
                irq_desc[i].status      = IRQ_DISABLED;
                irq_desc[i].action      = 0;
                irq_desc[i].depth       = 1;
-               irq_desc[i].handler     = &lasat_irq_type;
+               irq_desc[i].chip        = &lasat_irq_type;
        }
 }