Merge "iommu: msm: Provide the IOMMU_NOEXEC flag explicitly during mapping" into msm-4.8 (8aa6b7de) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/mm/dma-mapping.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1305,7 +1305,7 @@ __iommu_create_mapping(struct device dev, struct page *pages, size_t size)

		len = (j - i) << PAGE_SHIFT;
		ret = iommu_map(mapping->domain, iova, phys, len,
		IOMMU_READ\|IOMMU_WRITE);
		IOMMU_READ\|IOMMU_WRITE\|IOMMU_NOEXEC);
		if (ret < 0)
		goto fail;
		iova += len;