From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sat, 27 Jun 2009 16:44:39 +0000 (+0100)
Subject: intel-iommu: Make dma_pte_clear_one() take pfn not address
X-Git-Tag: v2.6.31-rc2~12^2~31
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a75f7cf94f01717c5103138319b96752ee2a2be9;p=karo-tx-linux.git

intel-iommu: Make dma_pte_clear_one() take pfn not address

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index edd39d348a98..40eae2097aca 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -764,12 +764,12 @@ static struct dma_pte *dma_pfn_level_pte(struct dmar_domain *domain,
 }
 
 /* clear one page's page table */
-static void dma_pte_clear_one(struct dmar_domain *domain, u64 addr)
+static void dma_pte_clear_one(struct dmar_domain *domain, unsigned long pfn)
 {
 	struct dma_pte *pte = NULL;
 
 	/* get last level pte */
-	pte = dma_pfn_level_pte(domain, addr >> VTD_PAGE_SHIFT, 1);
+	pte = dma_pfn_level_pte(domain, pfn, 1);
 
 	if (pte) {
 		dma_clear_pte(pte);
@@ -792,7 +792,7 @@ static void dma_pte_clear_range(struct dmar_domain *domain, u64 start, u64 end)
 
 	/* we don't need lock here, nobody else touches the iova range */
 	while (npages--) {
-		dma_pte_clear_one(domain, start);
+		dma_pte_clear_one(domain, start >> VTD_PAGE_SHIFT);
 		start += VTD_PAGE_SIZE;
 	}
 }