Merge "arm64: dma-mapping: Implement DMA_ATTR_IOMMU_USE_UPSTREAM_HINT" into msm-4.8

arch/arm64/mm/dma-mapping.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,8 @@ static int __get_iommu_pgprot(unsigned long attrs, int prot,
		{
		if (!(attrs & DMA_ATTR_EXEC_MAPPING))
		prot \|= IOMMU_NOEXEC;
		if (attrs & DMA_ATTR_IOMMU_USE_UPSTREAM_HINT)
		prot \|= IOMMU_USE_UPSTREAM_HINT;
		if (coherent)
		prot \|= IOMMU_CACHE;