From 3dc1124972daf4156c3c037994670712f0cf711c Mon Sep 17 00:00:00 2001
From: Zachary Amsden <zamsden@redhat.com>
Date: Thu, 19 Aug 2010 22:07:22 -1000
Subject: [PATCH] --- yaml --- r: 215765 b: refs/heads/master c:
 6755bae8e69093b2994b6f29cd3eaecdf610374e h: refs/heads/master i:   215763:
 c3d7a5283382d5238ef23cd900ad3ab38b473753 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 649411614dc0..b05822906ccc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cfdc0008542b57caadbfe013da163131a8293f4
+refs/heads/master: 6755bae8e69093b2994b6f29cd3eaecdf610374e
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 699c6b89c1b4..a8dee58e8716 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -5457,6 +5457,10 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
 struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
 						unsigned int id)
 {
+	if (check_tsc_unstable() && atomic_read(&kvm->online_vcpus) != 0)
+		printk_once(KERN_WARNING
+		"kvm: SMP vm created on host with unstable TSC; "
+		"guest TSC will not be reliable\n");
 	return kvm_x86_ops->vcpu_create(kvm, id);
 }