From 3f4b368b72f287f746462364ebec36f9b701db75 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 30 Jan 2008 13:33:35 +0100 Subject: [PATCH] --- yaml --- r: 80394 b: refs/heads/master c: cd7d72bb27a8c7502a602bdc299f1bb0a9357975 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mtrr/main.c | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index a246def3c578..47059fc4408a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a1b62fe858ba6780a9aeb4ab5f7751038a6c15d +refs/heads/master: cd7d72bb27a8c7502a602bdc299f1bb0a9357975 diff --git a/trunk/arch/x86/kernel/cpu/mtrr/main.c b/trunk/arch/x86/kernel/cpu/mtrr/main.c index ac4b6338f3f4..715919582657 100644 --- a/trunk/arch/x86/kernel/cpu/mtrr/main.c +++ b/trunk/arch/x86/kernel/cpu/mtrr/main.c @@ -706,20 +706,17 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn) /* kvm/qemu doesn't have mtrr set right, don't trim them all */ if (!highest_addr) { - printk(KERN_WARNING "***************\n"); - printk(KERN_WARNING "**** WARNING: likely strange cpu\n"); - printk(KERN_WARNING "**** MTRRs all blank, cpu in qemu?\n"); - printk(KERN_WARNING "***************\n"); + printk(KERN_WARNING "WARNING: strange, CPU MTRRs all blank?\n"); + WARN_ON(1); return 0; } if ((highest_addr >> PAGE_SHIFT) < end_pfn) { - printk(KERN_WARNING "***************\n"); - printk(KERN_WARNING "**** WARNING: likely BIOS bug\n"); - printk(KERN_WARNING "**** MTRRs don't cover all of " - "memory, trimmed %ld pages\n", end_pfn - - (highest_addr >> PAGE_SHIFT)); - printk(KERN_WARNING "***************\n"); + printk(KERN_WARNING "WARNING: BIOS bug: CPU MTRRs don't cover" + " all of memory, losing %LdMB of RAM.\n", + (((u64)end_pfn << PAGE_SHIFT) - highest_addr) >> 20); + + WARN_ON(1); printk(KERN_INFO "update e820 for mtrr\n"); trim_start = highest_addr;