From 4ca08786784db5642571bb9e5b5d27617e98db0a Mon Sep 17 00:00:00 2001
From: Fenghua Yu <fenghua.yu@intel.com>
Date: Tue, 4 Aug 2009 15:10:59 -0700
Subject: [PATCH] --- yaml --- r: 156461 b: refs/heads/master c:
 33041ec049d39a6e0463c7edc7b6f631d24559e3 h: refs/heads/master i:   156459:
 69e6783fa9116cce85032436f2cf90bbc0c40a58 v: v3

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

diff --git a/[refs] b/[refs]
index e54b1528bd2e..e546991d79e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f532959b77e5e567c84c914cb7c7b07d2582448b
+refs/heads/master: 33041ec049d39a6e0463c7edc7b6f631d24559e3
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
index 11b317a78b49..af7ff9b5aed8 100644
--- a/trunk/drivers/pci/intel-iommu.c
+++ b/trunk/drivers/pci/intel-iommu.c
@@ -2551,6 +2551,7 @@ static dma_addr_t __intel_map_single(struct device *hwdev, phys_addr_t paddr,
 	int prot = 0;
 	int ret;
 	struct intel_iommu *iommu;
+	unsigned long paddr_pfn = paddr >> PAGE_SHIFT;
 
 	BUG_ON(dir == DMA_NONE);
 
@@ -2585,7 +2586,7 @@ static dma_addr_t __intel_map_single(struct device *hwdev, phys_addr_t paddr,
 	 * is not a big problem
 	 */
 	ret = domain_pfn_mapping(domain, mm_to_dma_pfn(iova->pfn_lo),
-				 paddr >> VTD_PAGE_SHIFT, size, prot);
+				 mm_to_dma_pfn(paddr_pfn), size, prot);
 	if (ret)
 		goto error;