From ae3c940effa8351f87b26edd7c3183044b44b2b6 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Sat, 21 Jun 2008 03:50:47 -0700 Subject: [PATCH] --- yaml --- r: 99456 b: refs/heads/master c: 0754557d72c1fbfc5fcfd5235e7c23ae6f77248c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/aperture_64.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 03434944fcf6..6d33feb942f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33ee375b2ea5dd11581a57d67bedd0ca39b19a5e +refs/heads/master: 0754557d72c1fbfc5fcfd5235e7c23ae6f77248c diff --git a/trunk/arch/x86/kernel/aperture_64.c b/trunk/arch/x86/kernel/aperture_64.c index 3409abb231ac..e819362c7068 100644 --- a/trunk/arch/x86/kernel/aperture_64.c +++ b/trunk/arch/x86/kernel/aperture_64.c @@ -324,8 +324,8 @@ void __init early_gart_iommu_check(void) fix = 1; if (gart_fix_e820 && !fix && aper_enabled) { - if (!e820_all_mapped(aper_base, aper_base + aper_size, - E820_RESERVED)) { + if (e820_any_mapped(aper_base, aper_base + aper_size, + E820_RAM)) { /* reserve it, so we can reuse it in second kernel */ printk(KERN_INFO "update e820 for GART\n"); add_memory_region(aper_base, aper_size, E820_RESERVED);