Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49f19ce4 authored by Olof Johansson's avatar Olof Johansson Committed by Linus Torvalds
Browse files

[PATCH] powerpc: irq change build breaks 



Fix up some of the buildbreaks from the irq handler changes.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 44aefd27

arch/powerpc/platforms/85xx/mpc85xx_ads.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void cpm2_cascade(unsigned int irq, struct irq_desc *desc, 
	int cascade_irq;



	while ((cascade_irq = cpm2_get_irq(regs)) >= 0) {

		generic_handle_irq(cascade_irq, regs);

		generic_handle_irq(cascade_irq);

	}

	desc->chip->eoi(irq);

}

arch/powerpc/platforms/85xx/mpc85xx_cds.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static void mpc85xx_8259_cascade(unsigned int irq, struct 
	unsigned int cascade_irq = i8259_irq(regs);



	if (cascade_irq != NO_IRQ)

		generic_handle_irq(cascade_irq, regs);

		generic_handle_irq(cascade_irq);



	desc->chip->eoi(irq);

}

arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc, 
{

	unsigned int cascade_irq = i8259_irq(regs);

	if (cascade_irq != NO_IRQ)

		generic_handle_irq(cascade_irq, regs);

		generic_handle_irq(cascade_irq);

	desc->chip->eoi(irq);

}

#endif	/* CONFIG_PCI */

arch/powerpc/platforms/cell/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc, 
					irq_linear_revmap(iic_host,

							  base | cascade);

				if (cirq != NO_IRQ)

					generic_handle_irq(cirq, regs);

					generic_handle_irq(cirq);

			}

		/* post-ack level interrupts */

		ack = bits & ~IIC_ISR_EDGE_MASK;

arch/powerpc/platforms/chrp/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static void chrp_8259_cascade(unsigned int irq, struct irq_desc *desc, 
{

	unsigned int cascade_irq = i8259_irq(regs);

	if (cascade_irq != NO_IRQ)

		generic_handle_irq(cascade_irq, regs);

		generic_handle_irq(cascade_irq);

	desc->chip->eoi(irq);

}