From 44d44a5cc46e728428bc6106cdfeba1fcd8cc423 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 29 Sep 2008 14:52:03 -0400 Subject: [PATCH] --- yaml --- r: 110392 b: refs/heads/master c: 9b1568458a3ef006361710dc12848aec891883b5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/aperture_64.c | 6 +++--- trunk/include/asm-x86/gart.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d09643cdde24..2afed193ae8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12544697f12e0ecdcf971075415c7678fae502af +refs/heads/master: 9b1568458a3ef006361710dc12848aec891883b5 diff --git a/trunk/arch/x86/kernel/aperture_64.c b/trunk/arch/x86/kernel/aperture_64.c index 44e21826db11..9a32b37ee2ee 100644 --- a/trunk/arch/x86/kernel/aperture_64.c +++ b/trunk/arch/x86/kernel/aperture_64.c @@ -455,11 +455,11 @@ void __init gart_iommu_hole_init(void) force_iommu || valid_agp || fallback_aper_force) { - printk(KERN_ERR + printk(KERN_INFO "Your BIOS doesn't leave a aperture memory hole\n"); - printk(KERN_ERR + printk(KERN_INFO "Please enable the IOMMU option in the BIOS setup\n"); - printk(KERN_ERR + printk(KERN_INFO "This costs you %d MB of RAM\n", 32 << fallback_aper_order); diff --git a/trunk/include/asm-x86/gart.h b/trunk/include/asm-x86/gart.h index 3f62a83887f3..583031cf45f4 100644 --- a/trunk/include/asm-x86/gart.h +++ b/trunk/include/asm-x86/gart.h @@ -52,15 +52,15 @@ static inline int aperture_valid(u64 aper_base, u32 aper_size, u32 min_size) return 0; if (aper_base + aper_size > 0x100000000ULL) { - printk(KERN_ERR "Aperture beyond 4GB. Ignoring.\n"); + printk(KERN_INFO "Aperture beyond 4GB. Ignoring.\n"); return 0; } if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) { - printk(KERN_ERR "Aperture pointing to e820 RAM. Ignoring.\n"); + printk(KERN_INFO "Aperture pointing to e820 RAM. Ignoring.\n"); return 0; } if (aper_size < min_size) { - printk(KERN_ERR "Aperture too small (%d MB) than (%d MB)\n", + printk(KERN_INFO "Aperture too small (%d MB) than (%d MB)\n", aper_size>>20, min_size>>20); return 0; }