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

Commit 35a84c2f authored by Olaf Hering's avatar Olaf Hering Committed by Paul Mackerras
Browse files

[POWERPC] Fix up after irq changes 



Remove struct pt_regs * from all handlers.
Also remove the regs argument from get_irq() functions.
Compile tested with arch/powerpc/config/* and
arch/ppc/configs/prep_defconfig

Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 1224f373

arch/powerpc/kernel/ibmebus.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ EXPORT_SYMBOL(ibmebus_unregister_driver); 


int ibmebus_request_irq(struct ibmebus_dev *dev,

			u32 ist, 

			irqreturn_t (*handler)(int, void*, struct pt_regs *),

			irqreturn_t (*handler)(int, void*),

			unsigned long irq_flags, const char * devname,

			void *dev_id)

{

arch/powerpc/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ void do_IRQ(struct pt_regs *regs) 
	 * The value -2 is for buggy hardware and means that this IRQ

	 * has already been handled. -- Tom

	 */

	irq = ppc_md.get_irq(regs);

	irq = ppc_md.get_irq();



	if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) {

#ifdef CONFIG_IRQSTACKS

arch/powerpc/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ void timer_interrupt(struct pt_regs * regs) 


#ifdef CONFIG_PPC_ISERIES

	if (hvlpevent_is_pending())

		process_hvlpevents(regs);

		process_hvlpevents();

#endif



#ifdef CONFIG_PPC64

arch/powerpc/platforms/82xx/mpc82xx_ads.c

+2 −3
Original line number Diff line number Diff line
@@ -384,8 +384,7 @@ struct hw_interrupt_type m82xx_pci_ic = { 
};



static void

m82xx_pci_irq_demux(unsigned int irq, struct irq_desc *desc,

		    struct pt_regs *regs)

m82xx_pci_irq_demux(unsigned int irq, struct irq_desc *desc)

{

	unsigned long stat, mask, pend;

	int bit;
@@ -398,7 +397,7 @@ m82xx_pci_irq_demux(unsigned int irq, struct irq_desc *desc, 
			break;

		for (bit = 0; pend != 0; ++bit, pend <<= 1) {

			if (pend & 0x80000000)

				__do_IRQ(pci_int_base + bit, regs);

				__do_IRQ(pci_int_base + bit);

		}

	}

}

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

+2 −3
Original line number Diff line number Diff line
@@ -66,12 +66,11 @@ mpc85xx_pcibios_fixup(void) 


#ifdef CONFIG_CPM2



static void cpm2_cascade(unsigned int irq, struct irq_desc *desc,

			 struct pt_regs *regs)

static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)

{

	int cascade_irq;



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

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

		generic_handle_irq(cascade_irq);

	}

	desc->chip->eoi(irq);