summaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-07-18 11:48:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-18 11:48:05 -0700
commitd4df33b0e9925c158b313a586fb1557cf29cfdf4 (patch)
tree181f956b71cec41398123ce65711e26563e9458f /drivers/xen
parent366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085 (diff)
parent8492101e15f9e2d30ab3533563d94590bb01c09c (diff)
downloadlinux-d4df33b0e9925c158b313a586fb1557cf29cfdf4.tar.gz
linux-d4df33b0e9925c158b313a586fb1557cf29cfdf4.tar.bz2
linux-d4df33b0e9925c158b313a586fb1557cf29cfdf4.zip
Merge branch 'for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
Pull swiotlb updates from Konrad Rzeszutek Wilk: "One compiler fix, and a bug-fix in swiotlb_nr_tbl() and swiotlb_max_segment() to check also for no_iotlb_memory" * 'for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb: swiotlb: fix phys_addr_t overflow warning swiotlb: Return consistent SWIOTLB segments/nr_tbl swiotlb: Group identical cleanup in swiotlb_cleanup()
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/swiotlb-xen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index d53f3493a6b9..cfbe46785a3b 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -402,7 +402,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
map = swiotlb_tbl_map_single(dev, start_dma_addr, phys, size, dir,
attrs);
- if (map == DMA_MAPPING_ERROR)
+ if (map == (phys_addr_t)DMA_MAPPING_ERROR)
return DMA_MAPPING_ERROR;
dev_addr = xen_phys_to_bus(map);