diff options
| author | YoungJun Cho | 2013-06-17 06:18:52 +0200 |
|---|---|---|
| committer | Marek Szyprowski | 2013-06-28 15:14:27 +0200 |
| commit | 836bfa0d2930b7ec236aa488f01678c92eb5f0de (patch) | |
| tree | e46c0978e8f2570eee94c39cbca0fe333a55d4ce /arch/arm/mm/dma-mapping.c | |
| parent | Linux 3.10-rc7 (diff) | |
| download | kernel-qcow2-linux-836bfa0d2930b7ec236aa488f01678c92eb5f0de.tar.gz kernel-qcow2-linux-836bfa0d2930b7ec236aa488f01678c92eb5f0de.tar.xz kernel-qcow2-linux-836bfa0d2930b7ec236aa488f01678c92eb5f0de.zip | |
ARM: dma-mapping: Get pages if the cpu_addr is out of atomic_pool
In __iommu_get_pages(), the cpu_addr is checked wheather in
atomic_pool range or not. So if the cpu_addr is in atomic_pool
range, it does not need to check twice.
Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index ef3e0f3aac96..1d158c223ebb 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1372,16 +1372,17 @@ static int arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma, void arm_iommu_free_attrs(struct device *dev, size_t size, void *cpu_addr, dma_addr_t handle, struct dma_attrs *attrs) { - struct page **pages = __iommu_get_pages(cpu_addr, attrs); + struct page **pages; size = PAGE_ALIGN(size); - if (!pages) { - WARN(1, "trying to free invalid coherent area: %p\n", cpu_addr); + if (__in_atomic_pool(cpu_addr, size)) { + __iommu_free_atomic(dev, cpu_addr, handle, size); return; } - if (__in_atomic_pool(cpu_addr, size)) { - __iommu_free_atomic(dev, cpu_addr, handle, size); + pages = __iommu_get_pages(cpu_addr, attrs); + if (!pages) { + WARN(1, "trying to free invalid coherent area: %p\n", cpu_addr); return; } |