From 0e1e367aab873becf3e21d9b0cf46d11154ebc3f Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 4 Oct 2010 16:20:16 +0200 Subject: pci: intr-remap: Free irte memory if SPARSE_IRQ=y With SPARSE_IRQ=y the irte descriptors are dynamically allocated, but not freed in free_irte(). That was ok as long as the sparse irq core was not freeing irq descriptors on destroy_irq(). Now we leak the irte descriptor. Free it in free_irte(). Signed-off-by: Thomas Gleixner Reviewed-by: Ingo Molnar Acked-by: Suresh Siddha Cc: David Woodhouse Cc: Jesse Barnes --- drivers/pci/intr_remapping.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'drivers/pci') diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c index fd1d2867cdcc..87ec390e10df 100644 --- a/drivers/pci/intr_remapping.c +++ b/drivers/pci/intr_remapping.c @@ -95,6 +95,15 @@ static struct irq_2_iommu *irq_2_iommu_alloc(unsigned int irq) return desc->irq_2_iommu; } +static void irq_2_iommu_free(unsigned int irq) +{ + struct irq_data *d = irq_get_irq_data(irq); + struct irq_2_iommu *p = d->irq_2_iommu; + + d->irq_2_iommu = NULL; + kfree(p); +} + #else /* !CONFIG_SPARSE_IRQ */ static struct irq_2_iommu irq_2_iommuX[NR_IRQS]; @@ -110,6 +119,9 @@ static struct irq_2_iommu *irq_2_iommu_alloc(unsigned int irq) { return irq_2_iommu(irq); } + +static void irq_2_iommu_free(unsigned int irq) { } + #endif static DEFINE_SPINLOCK(irq_2_ir_lock); @@ -440,6 +452,8 @@ int free_irte(int irq) spin_unlock_irqrestore(&irq_2_ir_lock, flags); + irq_2_iommu_free(irq); + return rc; } -- cgit v1.2.3