From 6754086ce67c0a1f5d7eac612102368781e14588 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Wed, 17 Sep 2008 12:17:00 +0200
Subject: AMD IOMMU: simplify dma_mask_to_pages
The current calculation is very complicated. This patch replaces it with
a much simpler version.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/amd_iommu.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'arch/x86/kernel/amd_iommu.c')
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index f405a61..db64482 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -472,8 +472,7 @@ static int init_unity_mappings_for_device(struct dma_ops_domain *dma_dom,
****************************************************************************/
static unsigned long dma_mask_to_pages(unsigned long mask)
{
- return (mask >> PAGE_SHIFT) +
- (PAGE_ALIGN(mask & ~PAGE_MASK) >> PAGE_SHIFT);
+ return PAGE_ALIGN(mask) >> PAGE_SHIFT;
}
/*
--
cgit v1.1