From 7ebdcbdbd99c3d934bde32002648e9ca2327aaa1 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 21 Feb 2008 15:50:14 +0100
Subject: [PATCH] --- yaml --- r: 86347 b: refs/heads/master c:
 4147c8747eace9058c606b35e700060297edaf91 h: refs/heads/master i:   86345:
 e7671f26fc7ef06d2ce8e3c94456b088826fcc3c   86343:
 94640ad5b9f150c79f2457237311207eeb606cef v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/kernel/cpu/mtrr/main.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c0b6276caa45..d587f2700dfe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d119b2c9a490e2d647eae134211b32a18a04c7d
+refs/heads/master: 4147c8747eace9058c606b35e700060297edaf91
diff --git a/trunk/arch/x86/kernel/cpu/mtrr/main.c b/trunk/arch/x86/kernel/cpu/mtrr/main.c
index c8fda3eb3d7e..be83336fddba 100644
--- a/trunk/arch/x86/kernel/cpu/mtrr/main.c
+++ b/trunk/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;
@@ -689,8 +690,11 @@ 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) {
-		printk(KERN_WARNING "WARNING: strange, CPU MTRRs all blank?\n");
-		WARN_ON(1);
+		if (!kvm_para_available()) {
+			printk(KERN_WARNING
+				"WARNING: strange, CPU MTRRs all blank?\n");
+			WARN_ON(1);
+		}
 		return 0;
 	}