[PATCH 05/22] x86: rename swiotlb_dma_ops
From: Konrad Rzeszutek Wilk <hidden>
Date: 2018-01-12 13:25:42
Also in:
linux-arch, linux-iommu, linux-mips, linuxppc-dev, lkml
From: Konrad Rzeszutek Wilk <hidden>
Date: 2018-01-12 13:25:42
Also in:
linux-arch, linux-iommu, linux-mips, linuxppc-dev, lkml
On Wed, Jan 10, 2018 at 09:09:15AM +0100, Christoph Hellwig wrote:
We'll need that name for a generic implementation soon. Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Konrad Rzeszutek Wilk <redacted>
--- arch/x86/kernel/pci-swiotlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c index 9d3e35c33d94..0d77603c2f50 100644 --- a/arch/x86/kernel/pci-swiotlb.c +++ b/arch/x86/kernel/pci-swiotlb.c@@ -48,7 +48,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size, dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs); } -static const struct dma_map_ops swiotlb_dma_ops = { +static const struct dma_map_ops x86_swiotlb_dma_ops = { .mapping_error = swiotlb_dma_mapping_error, .alloc = x86_swiotlb_alloc_coherent, .free = x86_swiotlb_free_coherent,@@ -112,7 +112,7 @@ void __init pci_swiotlb_init(void) { if (swiotlb) { swiotlb_init(0); - dma_ops = &swiotlb_dma_ops; + dma_ops = &x86_swiotlb_dma_ops; } }-- 2.14.2