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 <h...@lst.de> Reviewed-by: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> > --- > 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 >
- consolidate swiotlb dma_map implementations Christoph Hellwig
- [PATCH 01/22] swiotlb: suppress warning when __... Christoph Hellwig
- [PATCH 02/22] arm64: rename swiotlb_dma_ops Christoph Hellwig
- Re: [PATCH 02/22] arm64: rename swiotlb_dma... Robin Murphy
- [PATCH 03/22] ia64: rename swiotlb_dma_ops Christoph Hellwig
- Re: [PATCH 03/22] ia64: rename swiotlb_dma_... Konrad Rzeszutek Wilk
- [PATCH 04/22] powerpc: rename swiotlb_dma_ops Christoph Hellwig
- Re: [PATCH 04/22] powerpc: rename swiotlb_d... Konrad Rzeszutek Wilk
- [PATCH 05/22] x86: rename swiotlb_dma_ops Christoph Hellwig
- Re: [PATCH 05/22] x86: rename swiotlb_dma_o... Konrad Rzeszutek Wilk
- [PATCH 06/22] swiotlb: rename swiotlb_free to s... Christoph Hellwig
- Re: [PATCH 06/22] swiotlb: rename swiotlb_f... Konrad Rzeszutek Wilk
- [PATCH 07/22] swiotlb: add common swiotlb_map_o... Christoph Hellwig
- [PATCH 08/22] swiotlb: wire up ->dma_support... Christoph Hellwig
- Re: [PATCH 08/22] swiotlb: wire up ->dma... Robin Murphy
- Re: [PATCH 08/22] swiotlb: wire up ->... Christoph Hellwig
- Re: [PATCH 08/22] swiotlb: wire up ... Robin Murphy
- [PATCH 09/22] swiotlb: refactor coherent buffer... Christoph Hellwig
- [PATCH 10/22] swiotlb: refactor coherent buffer... Christoph Hellwig
- Re: [PATCH 10/22] swiotlb: refactor coheren... Robin Murphy