Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[powerpc.git] / arch / ppc / platforms / sbc82xx.c

diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c
index 8cff1e3..cc0935c 100644 (file)
--- a/arch/ppc/platforms/sbc82xx.c
+++ b/arch/ppc/platforms/sbc82xx.c
@@ -121,7 +121,7 @@ struct hw_interrupt_type sbc82xx_i8259_ic = {
        .end = sbc82xx_i8259_end_irq,
 };
 
-static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id)
 {
        spin_lock(&sbc82xx_i8259_lock);
 
@@ -139,13 +139,13 @@ static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id, struct pt_regs *re
                        return IRQ_HANDLED;
                }
        }
-       __do_IRQ(NR_SIU_INTS + irq, regs);
+       __do_IRQ(NR_SIU_INTS + irq);
        return IRQ_HANDLED;
 }
 
 static struct irqaction sbc82xx_i8259_irqaction = {
        .handler = sbc82xx_i8259_demux,
-       .flags = SA_INTERRUPT,
+       .flags = IRQF_DISABLED,
        .mask = CPU_MASK_NONE,
        .name = "i8259 demux",
 };