Commit 07410559 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-direct: use is_swiotlb_active in dma_direct_map_page 



Use the more specific is_swiotlb_active check instead of checking the
global swiotlb_force variable.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent b2d229d4

kernel/dma/direct.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static inline dma_addr_t dma_direct_map_page(struct device *dev, 
		return swiotlb_map(dev, phys, size, dir, attrs);



	if (unlikely(!dma_capable(dev, dma_addr, size, true))) {

		if (swiotlb_force != SWIOTLB_NO_FORCE)

		if (is_swiotlb_active(dev))

			return swiotlb_map(dev, phys, size, dir, attrs);



		dev_WARN_ONCE(dev, 1,