From 778b1612d38b293ef08884e87ff5ff6df6615db3 Mon Sep 17 00:00:00 2001
From: Ronny Hegewald <ronny.hegewald@online.de>
Date: Fri, 31 Aug 2012 09:57:52 +0000
Subject: [PATCH] --- yaml --- r: 322549 b: refs/heads/master c:
 b5031ed1be0aa419250557123633453753181643 h: refs/heads/master i:   322547:
 65cb6e6e4e6242a4d4e29e0b6a40b6b0c8237bb7 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/xen/swiotlb-xen.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b364598219ce..856340546930 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce7184bdbd38d920fb515266fbbdc585ad2e5493
+refs/heads/master: b5031ed1be0aa419250557123633453753181643
diff --git a/trunk/drivers/xen/swiotlb-xen.c b/trunk/drivers/xen/swiotlb-xen.c
index 1afb4fba11b4..4d519488d304 100644
--- a/trunk/drivers/xen/swiotlb-xen.c
+++ b/trunk/drivers/xen/swiotlb-xen.c
@@ -232,7 +232,7 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
 		return ret;
 
 	if (hwdev && hwdev->coherent_dma_mask)
-		dma_mask = hwdev->coherent_dma_mask;
+		dma_mask = dma_alloc_coherent_mask(hwdev, flags);
 
 	phys = virt_to_phys(ret);
 	dev_addr = xen_phys_to_bus(phys);