---

yaml --- r: 212207 b: refs/heads/master c: 0e1e367 h: refs/heads/master i: 212205: 15380e9 212203: a9db034 212199: 83ee22e 212191: b54649a v: v3
git-mirror · Oct 12, 2010 · 91ce171 · 91ce171
1 parent e9cf734
commit 91ce171
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git 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
@@ -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;
 }