diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 14:25:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 14:25:40 -0800 |
| commit | 62ae144f56b61f541193df4a6465c06ee7eb9096 (patch) | |
| tree | 913cc058b162c48e6c72d2b016b9e44201b16cee /include/asm-parisc/irq.h | |
| parent | Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block (diff) | |
| parent | Merge branch 'master' (diff) | |
| download | linux-dev-62ae144f56b61f541193df4a6465c06ee7eb9096.tar.xz linux-dev-62ae144f56b61f541193df4a6465c06ee7eb9096.zip | |
Merge branch 'parisc' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'include/asm-parisc/irq.h')
| -rw-r--r-- | include/asm-parisc/irq.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-parisc/irq.h b/include/asm-parisc/irq.h index f876bdf22056..b0a30e2c9813 100644 --- a/include/asm-parisc/irq.h +++ b/include/asm-parisc/irq.h @@ -8,6 +8,7 @@ #define _ASM_PARISC_IRQ_H #include <linux/config.h> +#include <linux/cpumask.h> #include <asm/types.h> #define NO_IRQ (-1) @@ -49,10 +50,10 @@ extern int txn_alloc_irq(unsigned int nbits); extern int txn_claim_irq(int); 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 hw_interrupt_type *, void *); +extern int cpu_check_affinity(unsigned int irq, cpumask_t *dest); /* soft power switch support (power.c) */ extern struct tasklet_struct power_tasklet; |