iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next-cleanup' into for-v3.7

Browse Source
This commit is contained in:
Marek Szyprowski
2012-10-02 09:24:24 +02:00
parent abebfb18ea 75c5971614
commit 461b6f0d3d
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mm/dma-mapping.c
View File

@ -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;
}