From 2d9662a96da71de2a579bede70cf85ce7ddff432 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Fri, 8 Feb 2013 10:54:48 +0100 Subject: [PATCH] --- yaml --- r: 358823 b: refs/heads/master c: d589829107c5528164a9b7dfe50d0001780865ed h: refs/heads/master i: 358821: e2d708224515b91f0c88365d9d3b6ae2fe6c5b53 358819: 1bf153646552432af611ece17acd53c3a89bbd0b 358815: afff27bb8a8039bdf853536d4fbe5790c52c47f7 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/dma-mapping.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ea1f8954c8c4..9ee00bdbe5af 100644 --- 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 index 6e2511561c3e..c7e3759f16d3 100644 --- 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; }