diff --git a/[refs] b/[refs]
index fca9be6b7e18..2b4bb2285370 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4b2f07b2ed9b469ead87e06fc2fc3d12663a725
+refs/heads/master: ab2a47bd242d6cdcf6b2b64797f271c6f0a6d338
diff --git a/trunk/drivers/xen/swiotlb-xen.c b/trunk/drivers/xen/swiotlb-xen.c
index d45cbacaf6ff..ea8c28950322 100644
--- a/trunk/drivers/xen/swiotlb-xen.c
+++ b/trunk/drivers/xen/swiotlb-xen.c
@@ -293,9 +293,10 @@ 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))
-		panic("map_single: bounce buffer is not DMA'ble");
-
+	if (!dma_capable(dev, dev_addr, size)) {
+		swiotlb_tbl_unmap_single(dev, map, size, dir);
+		dev_addr = 0;
+	}
 	return dev_addr;
 }
 EXPORT_SYMBOL_GPL(xen_swiotlb_map_page);