Merge "arm64: Pass the correct coherent flag for iommu operations" into msm-4.8 (d75475f6) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/mm/dma-mapping.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1393,7 +1393,7 @@ static void __iommu_free_atomic(struct device dev, void cpu_addr,
		static void arm_iommu_alloc_attrs(struct device dev, size_t size,
		dma_addr_t *handle, gfp_t gfp, unsigned long attrs)
		{
		pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL, true);
		pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL, false);
		struct page **pages;
		void *addr = NULL;

		@@ -1445,7 +1445,7 @@ static int arm_iommu_mmap_attrs(struct device dev, struct vm_area_struct vma,
		unsigned long usize = vma->vm_end - vma->vm_start;
		struct page **pages = __iommu_get_pages(cpu_addr, attrs);

		vma->vm_page_prot = __get_dma_pgprot(attrs, vma->vm_page_prot, true);
		vma->vm_page_prot = __get_dma_pgprot(attrs, vma->vm_page_prot, false);

		if (!pages)
		return -ENXIO;