From 736ac76478cb73959ff1ea54258eb2dfd1e93eb2 Mon Sep 17 00:00:00 2001 From: Hiroshi Doyu Date: Tue, 11 Sep 2012 07:43:59 +0200 Subject: [PATCH] --- yaml --- r: 328949 b: refs/heads/master c: abebfb18ea4fe69e9a04187a77fed4e11d67dba4 h: refs/heads/master i: 328947: 15dad40acf919dcc977adac661b12362deb964ab v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/dma-mapping.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c70f37ae9dc9..6a69c0ebde2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1dc737c44a11c66f23ebeb09796f52f4b60d59c7 +refs/heads/master: abebfb18ea4fe69e9a04187a77fed4e11d67dba4 diff --git a/trunk/arch/arm/mm/dma-mapping.c b/trunk/arch/arm/mm/dma-mapping.c index 5d5a4c4a5db6..de7215c399c1 100644 --- a/trunk/arch/arm/mm/dma-mapping.c +++ b/trunk/arch/arm/mm/dma-mapping.c @@ -1624,7 +1624,6 @@ static void arm_coherent_iommu_unmap_page(struct device *dev, dma_addr_t handle, { struct dma_iommu_mapping *mapping = dev->archdata.mapping; dma_addr_t iova = handle & PAGE_MASK; - struct page *page = phys_to_page(iommu_iova_to_phys(mapping->domain, iova)); int offset = handle & ~PAGE_MASK; int len = PAGE_ALIGN(size + offset);