Commit 5cfe87d3 authored by Kyle McMartin's avatar Kyle McMartin Committed by Matthew Wilcox
Browse files

[PARISC] Fix up parisc irq handling for genirq changes 



Clean up enough to get things compiling again in the interim.

Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 6f03495d

arch/parisc/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ int show_interrupts(struct seq_file *p, void *v) 
** Then use that to get the Transaction address and data.

*/



int cpu_claim_irq(unsigned int irq, struct hw_interrupt_type *type, void *data)

int cpu_claim_irq(unsigned int irq, struct irq_chip *type, void *data)

{

	if (irq_desc[irq].action)

		return -EBUSY;

include/asm-parisc/irq.h

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static __inline__ int irq_canonicalize(int irq) 
	return (irq == 2) ? 9 : irq;

}



struct hw_interrupt_type;

struct irq_chip;



/*

 * Some useful "we don't have to do anything here" handlers.  Should
@@ -46,7 +46,7 @@ extern unsigned int txn_alloc_data(unsigned int); 
extern unsigned long txn_alloc_addr(unsigned int);

extern unsigned long txn_affinity_addr(unsigned int irq, int cpu);



extern int cpu_claim_irq(unsigned int irq, struct hw_interrupt_type *, void *);

extern int cpu_claim_irq(unsigned int irq, struct irq_chip *, void *);

extern int cpu_check_affinity(unsigned int irq, cpumask_t *dest);



/* soft power switch support (power.c) */