diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-15 09:27:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 10:53:15 -0400 |
commit | d6c88a507ef0b6afdb013cba4e7804ba7324d99a (patch) | |
tree | cdc4041acc212585e3920ad50bf2574cec04076d /include/linux/irq.h | |
parent | ee32c9732244bde4b9b59eeac2814c23e2b71f8d (diff) |
genirq: revert dynarray
Revert the dynarray changes. They need more thought and polishing.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/irq.h')
-rw-r--r-- | include/linux/irq.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 3f33c7790300..38bf89f2ade0 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
@@ -139,8 +139,6 @@ struct irq_chip { | |||
139 | const char *typename; | 139 | const char *typename; |
140 | }; | 140 | }; |
141 | 141 | ||
142 | struct timer_rand_state; | ||
143 | struct irq_2_iommu; | ||
144 | /** | 142 | /** |
145 | * struct irq_desc - interrupt descriptor | 143 | * struct irq_desc - interrupt descriptor |
146 | * | 144 | * |
@@ -167,9 +165,6 @@ struct irq_2_iommu; | |||
167 | */ | 165 | */ |
168 | struct irq_desc { | 166 | struct irq_desc { |
169 | unsigned int irq; | 167 | unsigned int irq; |
170 | #ifdef CONFIG_HAVE_DYN_ARRAY | ||
171 | unsigned int *kstat_irqs; | ||
172 | #endif | ||
173 | irq_flow_handler_t handle_irq; | 168 | irq_flow_handler_t handle_irq; |
174 | struct irq_chip *chip; | 169 | struct irq_chip *chip; |
175 | struct msi_desc *msi_desc; | 170 | struct msi_desc *msi_desc; |
@@ -198,23 +193,13 @@ struct irq_desc { | |||
198 | } ____cacheline_internodealigned_in_smp; | 193 | } ____cacheline_internodealigned_in_smp; |
199 | 194 | ||
200 | 195 | ||
201 | #ifndef CONFIG_HAVE_DYN_ARRAY | ||
202 | /* could be removed if we get rid of all irq_desc reference */ | ||
203 | extern struct irq_desc irq_desc[NR_IRQS]; | 196 | extern struct irq_desc irq_desc[NR_IRQS]; |
204 | #else | ||
205 | extern struct irq_desc *irq_desc; | ||
206 | #endif | ||
207 | 197 | ||
208 | static inline struct irq_desc *irq_to_desc(unsigned int irq) | 198 | static inline struct irq_desc *irq_to_desc(unsigned int irq) |
209 | { | 199 | { |
210 | return (irq < nr_irqs) ? irq_desc + irq : NULL; | 200 | return (irq < nr_irqs) ? irq_desc + irq : NULL; |
211 | } | 201 | } |
212 | 202 | ||
213 | #ifdef CONFIG_HAVE_DYN_ARRAY | ||
214 | #define kstat_irqs_this_cpu(DESC) \ | ||
215 | ((DESC)->kstat_irqs[smp_processor_id()]) | ||
216 | #endif | ||
217 | |||
218 | /* | 203 | /* |
219 | * Migration helpers for obsolete names, they will go away: | 204 | * Migration helpers for obsolete names, they will go away: |
220 | */ | 205 | */ |