diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-18 14:48:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-18 14:48:05 -0400 |
| commit | d4df33b0e9925c158b313a586fb1557cf29cfdf4 (patch) | |
| tree | 181f956b71cec41398123ce65711e26563e9458f /drivers/xen | |
| parent | 366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085 (diff) | |
| parent | 8492101e15f9e2d30ab3533563d94590bb01c09c (diff) | |
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.c | 2 |
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, | |||
| 402 | 402 | ||
| 403 | map = swiotlb_tbl_map_single(dev, start_dma_addr, phys, size, dir, | 403 | map = swiotlb_tbl_map_single(dev, start_dma_addr, phys, size, dir, |
| 404 | attrs); | 404 | attrs); |
| 405 | if (map == DMA_MAPPING_ERROR) | 405 | if (map == (phys_addr_t)DMA_MAPPING_ERROR) |
| 406 | return DMA_MAPPING_ERROR; | 406 | return DMA_MAPPING_ERROR; |
| 407 | 407 | ||
| 408 | dev_addr = xen_phys_to_bus(map); | 408 | dev_addr = xen_phys_to_bus(map); |