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 /drivers/pci/intr_remapping.c | |
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 'drivers/pci/intr_remapping.c')
-rw-r--r-- | drivers/pci/intr_remapping.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c index 0f43b265eee6..950769e87475 100644 --- a/drivers/pci/intr_remapping.c +++ b/drivers/pci/intr_remapping.c | |||
@@ -19,20 +19,13 @@ struct irq_2_iommu { | |||
19 | u8 irte_mask; | 19 | u8 irte_mask; |
20 | }; | 20 | }; |
21 | 21 | ||
22 | #ifdef CONFIG_HAVE_DYN_ARRAY | ||
23 | static struct irq_2_iommu *irq_2_iommuX; | ||
24 | DEFINE_DYN_ARRAY(irq_2_iommuX, sizeof(struct irq_2_iommu), nr_irqs, PAGE_SIZE, NULL); | ||
25 | #else | ||
26 | static struct irq_2_iommu irq_2_iommuX[NR_IRQS]; | 22 | static struct irq_2_iommu irq_2_iommuX[NR_IRQS]; |
27 | #endif | ||
28 | 23 | ||
29 | static struct irq_2_iommu *irq_2_iommu(unsigned int irq) | 24 | static struct irq_2_iommu *irq_2_iommu(unsigned int irq) |
30 | { | 25 | { |
31 | if (irq < nr_irqs) | 26 | return (irq < nr_irqs) ?: irq_2_iommuX + irq : NULL; |
32 | return &irq_2_iommuX[irq]; | ||
33 | |||
34 | return NULL; | ||
35 | } | 27 | } |
28 | |||
36 | static struct irq_2_iommu *irq_2_iommu_alloc(unsigned int irq) | 29 | static struct irq_2_iommu *irq_2_iommu_alloc(unsigned int irq) |
37 | { | 30 | { |
38 | return irq_2_iommu(irq); | 31 | return irq_2_iommu(irq); |