aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2012-10-02 09:24:24 +0200
committerMarek Szyprowski <m.szyprowski@samsung.com>2012-10-02 09:24:24 +0200
commit461b6f0d3d7d4e556035463b531136b034b7433e (patch)
treec3936799d29ae7ce82baa1e63c64c08aafe5b29b /arch
parentARM: dma-mapping: Remove unsed var at arm_coherent_iommu_unmap_page (diff)
parentARM: dma-mapping: Refrain noisy console message (diff)
downloadlinux-dev-461b6f0d3d7d4e556035463b531136b034b7433e.tar.xz
linux-dev-461b6f0d3d7d4e556035463b531136b034b7433e.zip
Merge branch 'next-cleanup' into for-v3.7
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mm/dma-mapping.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index de7215c399c1..477a2d23ddf1 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1059,11 +1059,12 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, gfp_t
if (!pages[i])
goto error;
- if (order)
+ if (order) {
split_page(pages[i], order);
- j = 1 << order;
- while (--j)
- pages[i + j] = pages[i] + j;
+ j = 1 << order;
+ while (--j)
+ pages[i + j] = pages[i] + j;
+ }
__dma_clear_buffer(pages[i], PAGE_SIZE << order);
i += 1 << order;
@@ -1814,7 +1815,7 @@ int arm_iommu_attach_device(struct device *dev,
dev->archdata.mapping = mapping;
set_dma_ops(dev, &iommu_ops);
- pr_info("Attached IOMMU controller to %s device.\n", dev_name(dev));
+ pr_debug("Attached IOMMU controller to %s device.\n", dev_name(dev));
return 0;
}