diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2011-02-10 11:21:02 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-02-10 11:21:02 -0600 |
| commit | 1c0f647690f1b9471d63af48dec960bc59492e61 (patch) | |
| tree | 5bfaabb033ec7b907a7c7ee19603d012e1c82867 /arch/parisc/include | |
| parent | 2c250ad23d438fa56e1beded374e44dc565c6c47 (diff) | |
| parent | 4c4231ea2f794d73bbb50b8d84e00c66a012a607 (diff) | |
| download | linux-1c0f647690f1b9471d63af48dec960bc59492e61.tar.gz linux-1c0f647690f1b9471d63af48dec960bc59492e61.tar.bz2 linux-1c0f647690f1b9471d63af48dec960bc59492e61.zip | |
Merge branch 'irq' into for-next
Diffstat (limited to 'arch/parisc/include')
| -rw-r--r-- | arch/parisc/include/asm/irq.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/parisc/include/asm/irq.h b/arch/parisc/include/asm/irq.h index c67dccf2e31f..1073599a7be9 100644 --- a/arch/parisc/include/asm/irq.h +++ b/arch/parisc/include/asm/irq.h @@ -32,15 +32,10 @@ static __inline__ int irq_canonicalize(int irq) } struct irq_chip; +struct irq_data; -/* - * Some useful "we don't have to do anything here" handlers. Should - * probably be provided by the generic code. - */ -void no_ack_irq(unsigned int irq); -void no_end_irq(unsigned int irq); -void cpu_ack_irq(unsigned int irq); -void cpu_eoi_irq(unsigned int irq); +void cpu_ack_irq(struct irq_data *d); +void cpu_eoi_irq(struct irq_data *d); extern int txn_alloc_irq(unsigned int nbits); extern int txn_claim_irq(int); @@ -49,7 +44,7 @@ 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 irq_chip *, void *); -extern int cpu_check_affinity(unsigned int irq, const struct cpumask *dest); +extern int cpu_check_affinity(struct irq_data *d, const struct cpumask *dest); /* soft power switch support (power.c) */ extern struct tasklet_struct power_tasklet; |