---

yaml --- r: 358823 b: refs/heads/master c: d589829 h: refs/heads/master i: 358821: e2d7082 358819: 1bf1536 358815: afff27b v: v3
git-mirror · Feb 25, 2013 · 2d9662a · 2d9662a
1 parent 9525fd7
commit 2d9662a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60460abffc71523d65774f43ce1252972eeb0629
+refs/heads/master: d589829107c5528164a9b7dfe50d0001780865ed
diff --git a/trunk/arch/arm/mm/dma-mapping.c b/trunk/arch/arm/mm/dma-mapping.c
@@ -1292,11 +1292,11 @@ static void *__iommu_alloc_atomic(struct device *dev, size_t size,
 	return NULL;
 }
 
-static void __iommu_free_atomic(struct device *dev, struct page **pages,
+static void __iommu_free_atomic(struct device *dev, void *cpu_addr,
 				dma_addr_t handle, size_t size)
 {
 	__iommu_remove_mapping(dev, handle, size);
-	__free_from_pool(page_address(pages[0]), size);
+	__free_from_pool(cpu_addr, size);
 }
 
 static void *arm_iommu_alloc_attrs(struct device *dev, size_t size,
@@ -1379,7 +1379,7 @@ void arm_iommu_free_attrs(struct device *dev, size_t size, void *cpu_addr,
 	}
 
 	if (__in_atomic_pool(cpu_addr, size)) {
-		__iommu_free_atomic(dev, pages, handle, size);
+		__iommu_free_atomic(dev, cpu_addr, handle, size);
 		return;
 	}