Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / kernel / dma-iommu.c

diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c
index 54d0116256f752247abd63d6619068c4d619d24d..4c68bfe4108a9873de802765373b9b7361058ecf 100644 (file)
--- a/arch/powerpc/kernel/dma-iommu.c
+++ b/arch/powerpc/kernel/dma-iommu.c
@@ -60,16 +60,16 @@ static int dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist,
                            int nelems, enum dma_data_direction direction,
                            struct dma_attrs *attrs)
 {
-       return iommu_map_sg(dev, get_iommu_table_base(dev), sglist, nelems,
-                           device_to_mask(dev), direction, attrs);
+       return ppc_iommu_map_sg(dev, get_iommu_table_base(dev), sglist, nelems,
+                               device_to_mask(dev), direction, attrs);
 }
 
 static void dma_iommu_unmap_sg(struct device *dev, struct scatterlist *sglist,
                int nelems, enum dma_data_direction direction,
                struct dma_attrs *attrs)
 {
-       iommu_unmap_sg(get_iommu_table_base(dev), sglist, nelems, direction,
-                      attrs);
+       ppc_iommu_unmap_sg(get_iommu_table_base(dev), sglist, nelems,
+                          direction, attrs);
 }
 
 /* We support DMA to/from any memory page via the iommu */