diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2006-06-29 02:24:38 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 10:26:22 -0700 |
| commit | a53da52fd743fd637637572838c0a7af23a2d038 (patch) | |
| tree | b62c205b609356db5bca378c6d04d6d899bfd499 /include | |
| parent | [PATCH] genirq: sem2mutex probe_sem -> probing_active (diff) | |
| download | linux-dev-a53da52fd743fd637637572838c0a7af23a2d038.tar.xz linux-dev-a53da52fd743fd637637572838c0a7af23a2d038.zip | |
[PATCH] genirq: cleanup: merge irq_affinity[] into irq_desc[]
Consolidation: remove the irq_affinity[NR_IRQS] array and move it into the
irq_desc[NR_IRQS].affinity field.
[akpm@osdl.org: sparc64 build fix]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irq.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 9597a6904239..6e3ad6245bd3 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -77,6 +77,9 @@ typedef struct irq_desc { unsigned int irq_count; /* For detecting broken interrupts */ unsigned int irqs_unhandled; spinlock_t lock; +#ifdef CONFIG_SMP + cpumask_t affinity; +#endif #if defined (CONFIG_GENERIC_PENDING_IRQ) || defined (CONFIG_IRQBALANCE) unsigned int move_irq; /* Flag need to re-target intr dest*/ #endif @@ -96,12 +99,10 @@ irq_descp (int irq) extern int setup_irq(unsigned int irq, struct irqaction * new); #ifdef CONFIG_GENERIC_HARDIRQS -extern cpumask_t irq_affinity[NR_IRQS]; - #ifdef CONFIG_SMP static inline void set_native_irq_info(int irq, cpumask_t mask) { - irq_affinity[irq] = mask; + irq_desc[irq].affinity = mask; } #else static inline void set_native_irq_info(int irq, cpumask_t mask) |