Commit b0086839 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-5.18-2' of git://git.infradead.org/users/hch/dma-mapping 

Pull dma-mapping fix from Christoph Hellwig:

 - avoid a double memory copy for swiotlb (Chao Gao)

* tag 'dma-mapping-5.18-2' of git://git.infradead.org/users/hch/dma-mapping:
  dma-direct: avoid redundant memory sync for swiotlb
parents 59250f8a 9e02977b

kernel/dma/direct.h

+2 −1
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ static inline void dma_direct_unmap_page(struct device *dev, dma_addr_t addr, 
		dma_direct_sync_single_for_cpu(dev, addr, size, dir);



	if (unlikely(is_swiotlb_buffer(dev, phys)))

		swiotlb_tbl_unmap_single(dev, phys, size, dir, attrs);

		swiotlb_tbl_unmap_single(dev, phys, size, dir,

					 attrs | DMA_ATTR_SKIP_CPU_SYNC);

}

#endif /* _KERNEL_DMA_DIRECT_H */