From 247aeee27132a256ad990071166f7c9cfe3aa178 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Wed, 3 Dec 2008 15:06:57 +0100 Subject: [PATCH] --- yaml --- r: 125593 b: refs/heads/master c: d14d65777c2491dd5baf1e17f444b8f653f3cbb1 h: refs/heads/master i: 125591: 3ee69d0a3d22d92ace342293f7995e6d6d547083 v: v3 --- [refs] | 2 +- trunk/drivers/pci/intel-iommu.c | 7 ++++--- trunk/include/linux/intel-iommu.h | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d69974757ee2..ba7c96bd7d96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dde57a210dcdce85e2813bab8f88687761d9f6a6 +refs/heads/master: d14d65777c2491dd5baf1e17f444b8f653f3cbb1 diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c index 8af6c96f31b3..712810598a2e 100644 --- a/trunk/drivers/pci/intel-iommu.c +++ b/trunk/drivers/pci/intel-iommu.c @@ -3106,15 +3106,16 @@ int intel_iommu_found(void) } EXPORT_SYMBOL_GPL(intel_iommu_found); -u64 intel_iommu_iova_to_phys(struct dmar_domain *domain, u64 iova) +static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain, + unsigned long iova) { + struct dmar_domain *dmar_domain = domain->priv; struct dma_pte *pte; u64 phys = 0; - pte = addr_to_dma_pte(domain, iova); + pte = addr_to_dma_pte(dmar_domain, iova); if (pte) phys = dma_pte_addr(pte); return phys; } -EXPORT_SYMBOL_GPL(intel_iommu_iova_to_phys); diff --git a/trunk/include/linux/intel-iommu.h b/trunk/include/linux/intel-iommu.h index 6bc26e03858c..26ccc0294567 100644 --- a/trunk/include/linux/intel-iommu.h +++ b/trunk/include/linux/intel-iommu.h @@ -330,8 +330,6 @@ extern int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr, extern void qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu); -u64 intel_iommu_iova_to_phys(struct dmar_domain *domain, u64 iova); - #ifdef CONFIG_DMAR int intel_iommu_found(void); #else /* CONFIG_DMAR */