swiotlb: Use physical addresses for swiotlb_tbl_unmap_single

[mirror_ubuntu-artful-kernel.git] / drivers / xen / swiotlb-xen.c

diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 8a6035aa69c9a5b0c0f0af49df1f2597f1b8ff3c..4cedc284b5df660c3680361b41e63a32fe263797 100644 (file)
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -364,7 +364,7 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
         * Ensure that the address returned is DMA'ble
         */
        if (!dma_capable(dev, dev_addr, size)) {
-               swiotlb_tbl_unmap_single(dev, phys_to_virt(map), size, dir);
+               swiotlb_tbl_unmap_single(dev, map, size, dir);
                dev_addr = 0;
        }
        return dev_addr;
@@ -388,7 +388,7 @@ static void xen_unmap_single(struct device *hwdev, dma_addr_t dev_addr,
 
        /* NOTE: We use dev_addr here, not paddr! */
        if (is_xen_swiotlb_buffer(dev_addr)) {
-               swiotlb_tbl_unmap_single(hwdev, phys_to_virt(paddr), size, dir);
+               swiotlb_tbl_unmap_single(hwdev, paddr, size, dir);
                return;
        }