From 808cfad883b4faffc29062563cb88e2b3ccdd92d Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Wed, 2 Sep 2009 17:30:00 +0200 Subject: [PATCH] --- yaml --- r: 158095 b: refs/heads/master c: 8c8c143cdc95ebe50fd962917556e25e8912997b h: refs/heads/master i: 158093: a1c23e7619a5251f6bae03dcd85adf95786a777a 158091: 688f8bb09f99afc080dd21737beb136030ef3008 158087: 4e8e01686ce121ce1f27f2d179e879487afec492 158079: b07a46456d9a97750c812aaa998626844c66ac47 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/amd_iommu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 591492b739b1..824a37a40e49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8bc3e127421bf3b735edbde05135892c12c5f615 +refs/heads/master: 8c8c143cdc95ebe50fd962917556e25e8912997b diff --git a/trunk/arch/x86/kernel/amd_iommu.c b/trunk/arch/x86/kernel/amd_iommu.c index 3be2b61fc31f..ebc1c8443926 100644 --- a/trunk/arch/x86/kernel/amd_iommu.c +++ b/trunk/arch/x86/kernel/amd_iommu.c @@ -1402,7 +1402,7 @@ static u64* dma_ops_get_pte(struct dma_ops_domain *dom, pte = alloc_pte(&dom->domain, address, &pte_page, GFP_ATOMIC); aperture->pte_pages[APERTURE_PAGE_INDEX(address)] = pte_page; } else - pte += IOMMU_PTE_L0_INDEX(address); + pte += PM_LEVEL_INDEX(0, address); update_domain(&dom->domain); @@ -1466,7 +1466,7 @@ static void dma_ops_domain_unmap(struct amd_iommu *iommu, if (!pte) return; - pte += IOMMU_PTE_L0_INDEX(address); + pte += PM_LEVEL_INDEX(0, address); WARN_ON(!*pte);