Gitweb: http://git.kernel.org/linus/77dfa56c94d2855a25ff552b74980a5538e129f8
Commit: 77dfa56c94d2855a25ff552b74980a5538e129f8
Parent: dd4e831960e4f0214480fa96a53ca9bb7dd04927
Author: David Woodhouse <David.Woodhouse@intel.com>
AuthorDate: Sat Jun 27 16:40:08 2009 +0100
Committer: David Woodhouse <David.Woodhouse@intel.com>
CommitDate: Mon Jun 29 12:38:32 2009 +0100
intel-iommu: Change address_level_offset() to pfn_level_offset()
We're shifting the inputs for now, but that'll change...
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
drivers/pci/intel-iommu.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 852f40a..529c1c1 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -671,9 +671,9 @@ static inline unsigned int level_to_offset_bits(int level)
return (12 + (level - 1) * LEVEL_STRIDE);
}
-static inline int address_level_offset(u64 addr, int level)
+static inline int pfn_level_offset(unsigned long pfn, int level)
{
- return ((addr >> level_to_offset_bits(level)) & LEVEL_MASK);
+ return (pfn >> (level_to_offset_bits(level) - 12)) & LEVEL_MASK;
}
static inline u64 level_mask(int level)
@@ -708,7 +708,7 @@ static struct dma_pte * addr_to_dma_pte(struct dmar_domain *domain, u64 addr)
while (level > 0) {
void *tmp_page;
- offset = address_level_offset(addr, level);
+ offset = pfn_level_offset(addr >> VTD_PAGE_SHIFT, level);
pte = &parent[offset];
if (level == 1)
break;
@@ -749,7 +749,7 @@ static struct dma_pte *dma_addr_level_pte(struct dmar_domain *domain, u64 addr,
parent = domain->pgd;
while (level <= total) {
- offset = address_level_offset(addr, total);
+ offset = pfn_level_offset(addr >> VTD_PAGE_SHIFT, total);
pte = &parent[offset];
if (level == total)
return pte;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
