aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/irq.h
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-08-25 15:41:19 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-16 10:53:04 -0400
commit8c464a4b23ca283b414022ebc77787f3c7040fa7 (patch)
tree1d62a78b0af21492289d015c81270683f6bbe0bd /include/linux/irq.h
parente492c5ae85428d4a3815d06bf308c590120b928b (diff)
sparseirq: move kstat_irqs from kstat to irq_desc - fix
fix non-sparseirq architectures. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/irq.h')
-rw-r--r--include/linux/irq.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 2445d2b3d5dc..93fe9a943e71 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -161,8 +161,6 @@ struct irq_desc {
161#endif 161#endif
162#ifdef CONFIG_HAVE_DYN_ARRAY 162#ifdef CONFIG_HAVE_DYN_ARRAY
163 unsigned int *kstat_irqs; 163 unsigned int *kstat_irqs;
164#else
165 unsigned int kstat_irqs[NR_CPUS];
166#endif 164#endif
167#if defined(CONFIG_INTR_REMAP) && defined(CONFIG_HAVE_SPARSE_IRQ) 165#if defined(CONFIG_INTR_REMAP) && defined(CONFIG_HAVE_SPARSE_IRQ)
168 struct irq_2_iommu *irq_2_iommu; 166 struct irq_2_iommu *irq_2_iommu;
@@ -219,8 +217,10 @@ extern struct irq_desc *sparse_irqs;
219 217
220#endif 218#endif
221 219
220#ifdef CONFIG_HAVE_DYN_ARRAY
222#define kstat_irqs_this_cpu(DESC) \ 221#define kstat_irqs_this_cpu(DESC) \
223 ((DESC)->kstat_irqs[smp_processor_id()]) 222 ((DESC)->kstat_irqs[smp_processor_id()])
223#endif
224 224
225/* 225/*
226 * Migration helpers for obsolete names, they will go away: 226 * Migration helpers for obsolete names, they will go away: