Merge tag 'dma-mapping-4.20-2' of git://git.infradead.org/users/hch/dma-mapping

torvalds · torvalds · commit 3308a383ce99 · 2018-11-03T10:53:33.000-07:00
Pull dma-mapping fix from Christoph Hellwig:
 "Avoid compile warnings on non-default arm64 configs"

* tag 'dma-mapping-4.20-2' of git://git.infradead.org/users/hch/dma-mapping:
  arm64: fix warnings without CONFIG_IOMMU_DMA
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
@@ -160,6 +160,7 @@ void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,
 	__dma_unmap_area(phys_to_virt(paddr), size, dir);
 }
 
+#ifdef CONFIG_IOMMU_DMA
 static int __swiotlb_get_sgtable_page(struct sg_table *sgt,
 				      struct page *page, size_t size)
 {
@@ -188,6 +189,7 @@ static int __swiotlb_mmap_pfn(struct vm_area_struct *vma,
 
 	return ret;
 }
+#endif /* CONFIG_IOMMU_DMA */
 
 static int __init atomic_pool_init(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,`
`160`	`160`	`__dma_unmap_area(phys_to_virt(paddr), size, dir);`
`161`	`161`	`}`
`162`	`162`
	`163`	`+#ifdef CONFIG_IOMMU_DMA`
`163`	`164`	`static int __swiotlb_get_sgtable_page(struct sg_table *sgt,`
`164`	`165`	`struct page *page, size_t size)`
`165`	`166`	`{`
`@@ -188,6 +189,7 @@ static int __swiotlb_mmap_pfn(struct vm_area_struct *vma,`
`188`	`189`
`189`	`190`	`return ret;`
`190`	`191`	`}`
	`192`	`+#endif /* CONFIG_IOMMU_DMA */`
`191`	`193`
`192`	`194`	`static int __init atomic_pool_init(void)`
`193`	`195`	`{`