Commit 3308a383 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'dma-mapping-4.20-2' of git://

Pull dma-mapping fix from Christoph Hellwig:
 "Avoid compile warnings on non-default arm64 configs"

* tag 'dma-mapping-4.20-2' of git://
  arm64: fix warnings without CONFIG_IOMMU_DMA
parents 9a12efc5 f6271755
......@@ -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);
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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment