aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/irq.h
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-01-07 18:03:13 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-10 22:46:26 -0500
commitd7e51e66899f95dabc89b4d4c6674a6e50fa37fc (patch)
tree5b4cc72a4e411d6962ce9ce7258abf2bac0204d4 /include/linux/irq.h
parente8b722f487589a1f60ca27adc695494f188d404e (diff)
sparseirq: make some func to be used with genirq
Impact: clean up sparseirq fallout on random.c Ingo suggested to change some ifdef from SPARSE_IRQ to GENERIC_HARDIRQS so we could some #ifdef later if all arch support genirq Signed-off-by: Yinghai Lu <yinghai@kernel.org> Acked-by: Matt Mackall <mpm@selenic.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/irq.h')
-rw-r--r--include/linux/irq.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h
index f899b502f186..e9a878978c85 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -160,12 +160,10 @@ struct irq_2_iommu;
160 */ 160 */
161struct irq_desc { 161struct irq_desc {
162 unsigned int irq; 162 unsigned int irq;
163#ifdef CONFIG_SPARSE_IRQ
164 struct timer_rand_state *timer_rand_state; 163 struct timer_rand_state *timer_rand_state;
165 unsigned int *kstat_irqs; 164 unsigned int *kstat_irqs;
166# ifdef CONFIG_INTR_REMAP 165#ifdef CONFIG_INTR_REMAP
167 struct irq_2_iommu *irq_2_iommu; 166 struct irq_2_iommu *irq_2_iommu;
168# endif
169#endif 167#endif
170 irq_flow_handler_t handle_irq; 168 irq_flow_handler_t handle_irq;
171 struct irq_chip *chip; 169 struct irq_chip *chip;
@@ -202,13 +200,13 @@ extern void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc
202extern struct irq_desc irq_desc[NR_IRQS]; 200extern struct irq_desc irq_desc[NR_IRQS];
203#else /* CONFIG_SPARSE_IRQ */ 201#else /* CONFIG_SPARSE_IRQ */
204extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int cpu); 202extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int cpu);
203#endif /* CONFIG_SPARSE_IRQ */
205 204
206#define kstat_irqs_this_cpu(DESC) \ 205#define kstat_irqs_this_cpu(DESC) \
207 ((DESC)->kstat_irqs[smp_processor_id()]) 206 ((DESC)->kstat_irqs[smp_processor_id()])
208#define kstat_incr_irqs_this_cpu(irqno, DESC) \ 207#define kstat_incr_irqs_this_cpu(irqno, DESC) \
209 ((DESC)->kstat_irqs[smp_processor_id()]++) 208 ((DESC)->kstat_irqs[smp_processor_id()]++)
210 209
211#endif /* CONFIG_SPARSE_IRQ */
212 210
213extern struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu); 211extern struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu);
214 212