diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-15 15:27:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 16:53:15 +0200 |
| commit | d6c88a507ef0b6afdb013cba4e7804ba7324d99a (patch) | |
| tree | cdc4041acc212585e3920ad50bf2574cec04076d /drivers/pci | |
| parent | ee32c9732244bde4b9b59eeac2814c23e2b71f8d (diff) | |
| download | blackbird-op-linux-d6c88a507ef0b6afdb013cba4e7804ba7324d99a.tar.gz blackbird-op-linux-d6c88a507ef0b6afdb013cba4e7804ba7324d99a.zip | |
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')
| -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 { u8 irte_mask; }; -#ifdef CONFIG_HAVE_DYN_ARRAY -static struct irq_2_iommu *irq_2_iommuX; -DEFINE_DYN_ARRAY(irq_2_iommuX, sizeof(struct irq_2_iommu), nr_irqs, PAGE_SIZE, NULL); -#else static struct irq_2_iommu irq_2_iommuX[NR_IRQS]; -#endif static struct irq_2_iommu *irq_2_iommu(unsigned int irq) { - if (irq < nr_irqs) - return &irq_2_iommuX[irq]; - - return NULL; + return (irq < nr_irqs) ?: irq_2_iommuX + irq : NULL; } + static struct irq_2_iommu *irq_2_iommu_alloc(unsigned int irq) { return irq_2_iommu(irq); |
