Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32

[linux-2.6] / arch / alpha / kernel / sys_titan.c

diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c
index 1473aa0e69826ef4e446d2c57d0d12be0c8a87ed..29ab7db81c30983cc113fcf5c51bea39375749f9 100644 (file)
--- a/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
@@ -178,7 +178,7 @@ titan_srm_device_interrupt(unsigned long vector)
        int irq;
 
        irq = (vector - 0x800) >> 4;
-       handle_irq(irq, get_irq_regs());
+       handle_irq(irq);
 }
 
 
@@ -204,7 +204,7 @@ static struct hw_interrupt_type titan_irq_type = {
 };
 
 static irqreturn_t
-titan_intr_nop(int irq, void *dev_id, struct pt_regs *regs)                    
+titan_intr_nop(int irq, void *dev_id)
 {
       /*
        * This is a NOP interrupt handler for the purposes of
@@ -243,9 +243,8 @@ titan_legacy_init_irq(void)
 }
 
 void
-titan_dispatch_irqs(u64 mask, struct pt_regs *regs)
+titan_dispatch_irqs(u64 mask)
 {
-       struct pt_regs *old_regs;
        unsigned long vector;
 
        /*
@@ -253,7 +252,6 @@ titan_dispatch_irqs(u64 mask, struct pt_regs *regs)
         */
        mask &= titan_cpu_irq_affinity[smp_processor_id()];
 
-       old_regs = set_irq_regs(regs);
        /*
         * Dispatch all requested interrupts 
         */
@@ -267,7 +265,6 @@ titan_dispatch_irqs(u64 mask, struct pt_regs *regs)
                /* dispatch it */
                alpha_mv.device_interrupt(vector);
        }
-       set_irq_regs(old_regs);
 }
   
 \f