diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-15 08:16:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 10:53:15 -0400 |
| commit | 2cc21ef843d4fb7da122239b644a1f6f0aca60a6 (patch) | |
| tree | 5d08e110164176c4011e42d4700ecd0050ad0ce9 /include/linux | |
| parent | c6b7674f323622d86316bf7951ad9cae1ce24642 (diff) | |
genirq: remove sparse irq code
This code is not ready, but we need to rip it out instead of rebasing
as we would lose the APIC/IO_APIC unification otherwise.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/irq.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 7d1adacaadb4..68e0f3f9df30 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
| @@ -167,16 +167,9 @@ struct irq_2_iommu; | |||
| 167 | */ | 167 | */ |
| 168 | struct irq_desc { | 168 | struct irq_desc { |
| 169 | unsigned int irq; | 169 | unsigned int irq; |
| 170 | #ifdef CONFIG_HAVE_SPARSE_IRQ | ||
| 171 | struct irq_desc *next; | ||
| 172 | struct timer_rand_state *timer_rand_state; | ||
| 173 | #endif | ||
| 174 | #ifdef CONFIG_HAVE_DYN_ARRAY | 170 | #ifdef CONFIG_HAVE_DYN_ARRAY |
| 175 | unsigned int *kstat_irqs; | 171 | unsigned int *kstat_irqs; |
| 176 | #endif | 172 | #endif |
| 177 | #if defined(CONFIG_INTR_REMAP) && defined(CONFIG_HAVE_SPARSE_IRQ) | ||
| 178 | struct irq_2_iommu *irq_2_iommu; | ||
| 179 | #endif | ||
| 180 | irq_flow_handler_t handle_irq; | 173 | irq_flow_handler_t handle_irq; |
| 181 | struct irq_chip *chip; | 174 | struct irq_chip *chip; |
| 182 | struct msi_desc *msi_desc; | 175 | struct msi_desc *msi_desc; |
| @@ -205,8 +198,6 @@ struct irq_desc { | |||
| 205 | } ____cacheline_internodealigned_in_smp; | 198 | } ____cacheline_internodealigned_in_smp; |
| 206 | 199 | ||
| 207 | 200 | ||
| 208 | #ifndef CONFIG_HAVE_SPARSE_IRQ | ||
| 209 | |||
| 210 | #ifndef CONFIG_HAVE_DYN_ARRAY | 201 | #ifndef CONFIG_HAVE_DYN_ARRAY |
| 211 | /* could be removed if we get rid of all irq_desc reference */ | 202 | /* could be removed if we get rid of all irq_desc reference */ |
| 212 | extern struct irq_desc irq_desc[NR_IRQS]; | 203 | extern struct irq_desc irq_desc[NR_IRQS]; |
| @@ -224,17 +215,6 @@ static inline struct irq_desc *irq_to_desc_alloc(unsigned int irq) | |||
| 224 | return irq_to_desc(irq); | 215 | return irq_to_desc(irq); |
| 225 | } | 216 | } |
| 226 | 217 | ||
| 227 | #else | ||
| 228 | |||
| 229 | extern struct irq_desc *irq_to_desc(unsigned int irq); | ||
| 230 | extern struct irq_desc *irq_to_desc_alloc(unsigned int irq); | ||
| 231 | |||
| 232 | extern struct irq_desc *sparse_irqs; | ||
| 233 | #define for_each_irq_desc(irqX, desc) \ | ||
| 234 | for (desc = sparse_irqs, irqX = desc->irq; desc; desc = desc->next, irqX = desc ? desc->irq : -1U) | ||
| 235 | |||
| 236 | #endif | ||
| 237 | |||
| 238 | #ifdef CONFIG_HAVE_DYN_ARRAY | 218 | #ifdef CONFIG_HAVE_DYN_ARRAY |
| 239 | #define kstat_irqs_this_cpu(DESC) \ | 219 | #define kstat_irqs_this_cpu(DESC) \ |
| 240 | ((DESC)->kstat_irqs[smp_processor_id()]) | 220 | ((DESC)->kstat_irqs[smp_processor_id()]) |
