diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-03 18:53:33 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-03 18:53:33 +0100 |
| commit | 3308a383ce99f739a3fa47dbd8564ab517562b51 (patch) | |
| tree | df21570cff267ea0c47125abb7ecf9b7a7676ed3 /arch | |
| parent | Merge tag 'kbuild-v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/m... (diff) | |
| parent | arm64: fix warnings without CONFIG_IOMMU_DMA (diff) | |
| download | linux-3308a383ce99f739a3fa47dbd8564ab517562b51.tar.xz linux-3308a383ce99f739a3fa47dbd8564ab517562b51.zip | |
Merge tag 'dma-mapping-4.20-2' of git://git.infradead.org/users/hch/dma-mapping
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 3a703e5d4e32..a3ac26284845 100644 --- 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) { |