From 7d9b9767a069b356d5c19365647f2a7e9a34f7ba Mon Sep 17 00:00:00 2001
From: Mike Travis <travis@sgi.com>
Date: Sat, 28 May 2011 13:15:05 -0500
Subject: [PATCH] --- yaml --- r: 252968 b: refs/heads/master c:
 c681d0ba1252954208220ad32248a3e8e2fc98e4 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/pci/intel-iommu.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5aa864e1c4c6..24efd6ceebf2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c9fc3d11b84fbd0c4f4aa7855702c2a1f098ebb
+refs/heads/master: c681d0ba1252954208220ad32248a3e8e2fc98e4
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
index 98be0b55ac0b..5cbab7f19ae0 100644
--- a/trunk/drivers/pci/intel-iommu.c
+++ b/trunk/drivers/pci/intel-iommu.c
@@ -2732,8 +2732,7 @@ static dma_addr_t __intel_map_single(struct device *hwdev, phys_addr_t paddr,
 	iommu = domain_get_iommu(domain);
 	size = aligned_nrpages(paddr, size);
 
-	iova = intel_alloc_iova(hwdev, domain, dma_to_mm_pfn(size),
-				pdev->dma_mask);
+	iova = intel_alloc_iova(hwdev, domain, dma_to_mm_pfn(size), dma_mask);
 	if (!iova)
 		goto error;