diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-06-29 05:24:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 13:26:22 -0400 |
commit | cd916d31cc31273eca8a620fae02b7bf7f577559 (patch) | |
tree | 1af0c37c1fd92c90a178ed1a7d1d8b5a90a1ddb8 /include/linux | |
parent | 4a733ee12618cf3ec25cbc337a5e0ba3ad5d7fb6 (diff) |
[PATCH] genirq: cleanup: merge pending_irq_cpumask[] into irq_desc[]
Consolidation: remove the pending_irq_cpumask[NR_IRQS] array and move it into
the irq_desc[NR_IRQS].pending_mask field.
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/linux')
-rw-r--r-- | include/linux/irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 1022c5d42546..81f3d976bb32 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
@@ -83,6 +83,7 @@ struct irq_desc { | |||
83 | cpumask_t affinity; | 83 | cpumask_t affinity; |
84 | #endif | 84 | #endif |
85 | #if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE) | 85 | #if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE) |
86 | cpumask_t pending_mask; | ||
86 | unsigned int move_irq; /* need to re-target IRQ dest */ | 87 | unsigned int move_irq; /* need to re-target IRQ dest */ |
87 | #endif | 88 | #endif |
88 | #ifdef CONFIG_PROC_FS | 89 | #ifdef CONFIG_PROC_FS |
@@ -120,7 +121,6 @@ static inline void set_native_irq_info(int irq, cpumask_t mask) | |||
120 | #ifdef CONFIG_SMP | 121 | #ifdef CONFIG_SMP |
121 | 122 | ||
122 | #if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE) | 123 | #if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE) |
123 | extern cpumask_t pending_irq_cpumask[NR_IRQS]; | ||
124 | 124 | ||
125 | void set_pending_irq(unsigned int irq, cpumask_t mask); | 125 | void set_pending_irq(unsigned int irq, cpumask_t mask); |
126 | void move_native_irq(int irq); | 126 | void move_native_irq(int irq); |