public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] X86: don't print a warning when MTRR are blank and running in KVM
@ 2008-02-21 14:50 Joerg Roedel
  2008-02-21 19:54 ` Yinghai Lu
  2008-02-21 20:37 ` Ingo Molnar
  0 siblings, 2 replies; 11+ messages in thread
From: Joerg Roedel @ 2008-02-21 14:50 UTC (permalink / raw)
  To: tglx, mingo; +Cc: linux-kernel, Joerg Roedel

Inside a KVM virtual machine the MTRRs are usually blank. This confuses Linux
and causes a warning message at boot. This patch removes that warning message
when running Linux as a KVM guest.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
 arch/x86/kernel/cpu/mtrr/main.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index b6e136f..47e624c 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -43,6 +43,7 @@
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include <asm/msr.h>
+#include <asm/kvm_para.h>
 #include "mtrr.h"
 
 u32 num_var_ranges = 0;
@@ -687,12 +688,14 @@ 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_pfn) {
+	if (!highest_pfn && !kvm_para_available()) {
 		printk(KERN_WARNING "WARNING: strange, CPU MTRRs all blank?\n");
 		WARN_ON(1);
-		return 0;
 	}
 
+	if (!highest_pfn)
+		return 0;
+
 	if (highest_pfn < end_pfn) {
 		printk(KERN_WARNING "WARNING: BIOS bug: CPU MTRRs don't cover"
 			" all of memory, losing %luMB of RAM.\n",
-- 
1.5.3.7




^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2008-02-22 12:48 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-21 14:50 [PATCH] X86: don't print a warning when MTRR are blank and running in KVM Joerg Roedel
2008-02-21 19:54 ` Yinghai Lu
2008-02-22 11:18   ` Joerg Roedel
2008-02-21 20:37 ` Ingo Molnar
2008-02-21 22:31   ` H. Peter Anvin
2008-02-22  9:45     ` Ingo Molnar
2008-02-22  9:58       ` H. Peter Anvin
2008-02-22 10:00         ` Ingo Molnar
2008-02-22 10:04           ` H. Peter Anvin
2008-02-22 11:15           ` Joerg Roedel
2008-02-22 12:48             ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox