diff options
-rw-r--r-- | arch/x86/kernel/amd_iommu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index f405a61f61fc..db64482b1796 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, | |||
472 | ****************************************************************************/ | 472 | ****************************************************************************/ |
473 | static unsigned long dma_mask_to_pages(unsigned long mask) | 473 | static unsigned long dma_mask_to_pages(unsigned long mask) |
474 | { | 474 | { |
475 | return (mask >> PAGE_SHIFT) + | 475 | return PAGE_ALIGN(mask) >> PAGE_SHIFT; |
476 | (PAGE_ALIGN(mask & ~PAGE_MASK) >> PAGE_SHIFT); | ||
477 | } | 476 | } |
478 | 477 | ||
479 | /* | 478 | /* |