From 323e9928fe3cf920f13ba01b31eee9c964f3b094 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Tue, 2 Dec 2008 20:16:03 +0100 Subject: [PATCH] --- yaml --- r: 119691 b: refs/heads/master c: 70d7d357578245f1993fd2d3ccd26088bcd38941 h: refs/heads/master i: 119689: c71cddaabc7f146d0aa6f74d2c029d4506f08346 119687: 0ff670a27a2cb19c0b1cbf6b5707902c56c72e04 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/pci-gart_64.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2f888be8f377..e860733dab19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b1dedca42ac0d0d0be01e39d8461bb53a2389b3 +refs/heads/master: 70d7d357578245f1993fd2d3ccd26088bcd38941 diff --git a/trunk/arch/x86/kernel/pci-gart_64.c b/trunk/arch/x86/kernel/pci-gart_64.c index a42b02b4df68..ba7ad83e20a8 100644 --- a/trunk/arch/x86/kernel/pci-gart_64.c +++ b/trunk/arch/x86/kernel/pci-gart_64.c @@ -123,6 +123,8 @@ static void free_iommu(unsigned long offset, int size) spin_lock_irqsave(&iommu_bitmap_lock, flags); iommu_area_free(iommu_gart_bitmap, offset, size); + if (offset >= next_bit) + next_bit = offset + size; spin_unlock_irqrestore(&iommu_bitmap_lock, flags); }