From 051d0f1adca06685ffa9c7fb32f224706c3704a6 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Fri, 16 Nov 2012 19:38:50 -0800 Subject: [PATCH] --- yaml --- r: 356193 b: refs/heads/master c: 5101730cb0613b91d40b9bb7be6bb023d2f6aa24 h: refs/heads/master i: 356191: 697963c3bd9cec8be1cdcfa5417107f9e1b5e0ee v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/amd_gart_64.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0dd64cacae1a..f4766f6ab7c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8eb5779f6b9c7e390c92f451edaafc039e06e743 +refs/heads/master: 5101730cb0613b91d40b9bb7be6bb023d2f6aa24 diff --git a/trunk/arch/x86/kernel/amd_gart_64.c b/trunk/arch/x86/kernel/amd_gart_64.c index e66311200cbd..b574b295a2f9 100644 --- a/trunk/arch/x86/kernel/amd_gart_64.c +++ b/trunk/arch/x86/kernel/amd_gart_64.c @@ -768,10 +768,9 @@ int __init gart_iommu_init(void) aper_base = info.aper_base; end_pfn = (aper_base>>PAGE_SHIFT) + (aper_size>>PAGE_SHIFT); - if (end_pfn > max_low_pfn_mapped) { - start_pfn = (aper_base>>PAGE_SHIFT); + start_pfn = PFN_DOWN(aper_base); + if (!pfn_range_is_mapped(start_pfn, end_pfn)) init_memory_mapping(start_pfn<