diff --git a/[refs] b/[refs] index 65138777db0b..31b376fd0e95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11369f356b66d363a615fde2c5526962f7683674 +refs/heads/master: 32b23e9a7331fce57eb0af52e19e8409fdef831b diff --git a/trunk/arch/x86/kernel/pci-gart_64.c b/trunk/arch/x86/kernel/pci-gart_64.c index a614ee10f846..c3fe78406d18 100644 --- a/trunk/arch/x86/kernel/pci-gart_64.c +++ b/trunk/arch/x86/kernel/pci-gart_64.c @@ -679,11 +679,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); + init_memory_mapping(start_pfn<