diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-01 14:36:13 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-01 14:36:13 -0500 |
commit | f6d2e6f57bba66272b28dd20c949b14ce39cb804 (patch) | |
tree | 2bf153af4d5b4b33ad2c1e88347c7fd752fb6332 /arch/x86/kernel/amd_iommu.c | |
parent | 8caac56305cef98f9357b060a77939d17699937d (diff) | |
parent | 7b1dedca42ac0d0d0be01e39d8461bb53a2389b3 (diff) |
Merge branch 'x86/urgent' into x86/iommu
Diffstat (limited to 'arch/x86/kernel/amd_iommu.c')
-rw-r--r-- | arch/x86/kernel/amd_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 172e0dc4641e..d434a97a4c7f 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -538,7 +538,7 @@ static void dma_ops_free_addresses(struct dma_ops_domain *dom, | |||
538 | address >>= PAGE_SHIFT; | 538 | address >>= PAGE_SHIFT; |
539 | iommu_area_free(dom->bitmap, address, pages); | 539 | iommu_area_free(dom->bitmap, address, pages); |
540 | 540 | ||
541 | if (address + pages >= dom->next_bit) | 541 | if (address >= dom->next_bit) |
542 | dom->need_flush = true; | 542 | dom->need_flush = true; |
543 | } | 543 | } |
544 | 544 | ||