diff options
| author | Christoph Hellwig | 2017-12-23 14:00:35 +0100 |
|---|---|---|
| committer | Christoph Hellwig | 2018-01-15 09:35:19 +0100 |
| commit | b7da40949ec54f5699ca7962d17b998989e72cdb (patch) | |
| tree | 4e8a0dc62d1471ba95d9eefa042c0d1c90aa47d8 /arch/arm64/mm/dma-mapping.c | |
| parent | swiotlb: suppress warning when __GFP_NOWARN is set (diff) | |
| download | kernel-qcow2-linux-b7da40949ec54f5699ca7962d17b998989e72cdb.tar.gz kernel-qcow2-linux-b7da40949ec54f5699ca7962d17b998989e72cdb.tar.xz kernel-qcow2-linux-b7da40949ec54f5699ca7962d17b998989e72cdb.zip | |
arm64: rename swiotlb_dma_ops
We'll need that name for a generic implementation soon.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Diffstat (limited to 'arch/arm64/mm/dma-mapping.c')
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index f3a637b98487..6840426bbe77 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -368,7 +368,7 @@ static int __swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t addr) return 0; } -static const struct dma_map_ops swiotlb_dma_ops = { +static const struct dma_map_ops arm64_swiotlb_dma_ops = { .alloc = __dma_alloc, .free = __dma_free, .mmap = __swiotlb_mmap, @@ -923,7 +923,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, const struct iommu_ops *iommu, bool coherent) { if (!dev->dma_ops) - dev->dma_ops = &swiotlb_dma_ops; + dev->dma_ops = &arm64_swiotlb_dma_ops; dev->archdata.dma_coherent = coherent; __iommu_setup_dma_ops(dev, dma_base, size, iommu); |