---

yaml --- r: 112555 b: refs/heads/master c: e4ad68b h: refs/heads/master i: 112553: 0e45574 112551: 18c7638 v: v3
git-mirror · Aug 22, 2008 · aa5fa66 · aa5fa66
1 parent 7f93185
commit aa5fa66
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: 43a5a5a09b8cfd56047706cf904718d073ccfd33
+refs/heads/master: e4ad68b651f22fa71820c0b30bb2807999b2b49f
diff --git a/trunk/arch/x86/kernel/pci-calgary_64.c b/trunk/arch/x86/kernel/pci-calgary_64.c
@@ -511,8 +511,22 @@ static void* calgary_alloc_coherent(struct device *dev, size_t size,
 	return ret;
 }
 
+static void calgary_free_coherent(struct device *dev, size_t size,
+				  void *vaddr, dma_addr_t dma_handle)
+{
+	unsigned int npages;
+	struct iommu_table *tbl = find_iommu_table(dev);
+
+	size = PAGE_ALIGN(size);
+	npages = size >> PAGE_SHIFT;
+
+	iommu_free(tbl, dma_handle, npages);
+	free_pages((unsigned long)vaddr, get_order(size));
+}
+
 static struct dma_mapping_ops calgary_dma_ops = {
 	.alloc_coherent = calgary_alloc_coherent,
+	.free_coherent = calgary_free_coherent,
 	.map_single = calgary_map_single,
 	.unmap_single = calgary_unmap_single,
 	.map_sg = calgary_map_sg,