Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core...

[linux.git] / arch / x86 / kernel / pci-gart_64.c

diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index a614ee10f8468ab8411955105b94d1dc858f90e2..be60961f8695681b2b96dcda25b694933b5f0d47 100644 (file)
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -32,6 +32,7 @@
 #include <asm/mtrr.h>
 #include <asm/pgtable.h>
 #include <asm/proto.h>
+#include <asm/iommu.h>
 #include <asm/gart.h>
 #include <asm/cacheflush.h>
 #include <asm/swiotlb.h>
@@ -679,11 +680,8 @@ static __init int init_k8_gatt(struct agp_kern_info *info)
        /* need to map that range */
        end_pfn = (aper_base>>PAGE_SHIFT) + (aper_size>>PAGE_SHIFT);
        if (end_pfn > max_low_pfn_mapped) {
-               start_pfn = max_low_pfn_mapped;
-               max_low_pfn_mapped = init_memory_mapping(start_pfn<<PAGE_SHIFT,
-                                                        end_pfn<<PAGE_SHIFT);
-               if (max_pfn_mapped < max_low_pfn_mapped)
-                       max_pfn_mapped = max_low_pfn_mapped;
+               start_pfn = (aper_base>>PAGE_SHIFT);
+               init_memory_mapping(start_pfn<<PAGE_SHIFT, end_pfn<<PAGE_SHIFT);
        }
        return 0;