From 91ce1714616191f5f66b5d3766722d35fa9c6e14 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 4 Oct 2010 16:20:16 +0200
Subject: [PATCH] --- yaml --- r: 212207 b: refs/heads/master c:
 0e1e367aab873becf3e21d9b0cf46d11154ebc3f h: refs/heads/master i:   212205:
 15380e9030b6050ca7c40c778a467a93101eb8e9   212203:
 a9db03497270788ab74c8d496708d98fc6c4fba1   212199:
 83ee22e5f63e64c1af7d572e1f52e46e08649d92   212191:
 b54649a5fa48a2dfa47a2d9817956fe35aa8f7b1 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/pci/intr_remapping.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 06c28f4f9af2..65bc6f0f0e73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc5fdf9f3aad37406b3c8d635a7940cd65de0c12
+refs/heads/master: 0e1e367aab873becf3e21d9b0cf46d11154ebc3f
diff --git a/trunk/drivers/pci/intr_remapping.c b/trunk/drivers/pci/intr_remapping.c
index fd1d2867cdcc..87ec390e10df 100644
--- a/trunk/drivers/pci/intr_remapping.c
+++ b/trunk/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;
 }