summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-01-09 17:05:09 +0100
committerChristoph Hellwig <hch@lst.de>2018-01-15 09:35:33 +0100
commit9ce9765a09123ba6b1fd9e76c48b3fdc92cea6e0 (patch)
tree54322f09dcecf72bd75e16910656eacccfd271ee /arch
parenta37a3710f3f91bfd14b0b20018e464a529d72471 (diff)
downloadblackbird-obmc-linux-9ce9765a09123ba6b1fd9e76c48b3fdc92cea6e0.tar.gz
blackbird-obmc-linux-9ce9765a09123ba6b1fd9e76c48b3fdc92cea6e0.zip
x86: 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: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/pci-swiotlb.c4
1 files 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;
}
}
OpenPOWER on IntegriCloud