From a62eed21e40034ed1213261c9b855b3e340813b7 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Mon, 14 Dec 2009 12:22:20 +0100
Subject: [PATCH] --- yaml --- r: 185951 b: refs/heads/master c:
 953899b659adce62cbe83d6a7527550ab8797c48 h: refs/heads/master i:   185949:
 d4385300441a0a81adfd4372bee17e84290cbe8e   185947:
 f4ee821fe429eddfbc34c7d53b9f6ca2c76ff635   185943:
 06c468d51da49681918d3d44dbdfc3012ac4fb38   185935:
 84b8d41d445bf9c1eadb91ef6600d12d2d8b396c   185919:
 4d33d18d42334ab768b0fb73d81f708e6582cace v: v3

---
 [refs]                   |  2 +-
 trunk/arch/x86/kvm/svm.c | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 87507ca5e63b..dedfa8454dc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e47c7a6d714cf352b719db92a924b6ec487acc5
+refs/heads/master: 953899b659adce62cbe83d6a7527550ab8797c48
diff --git a/trunk/arch/x86/kvm/svm.c b/trunk/arch/x86/kvm/svm.c
index 7f4e225feebf..b373ae6fb974 100644
--- a/trunk/arch/x86/kvm/svm.c
+++ b/trunk/arch/x86/kvm/svm.c
@@ -765,14 +765,16 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 	if (unlikely(cpu != vcpu->cpu)) {
 		u64 delta;
 
-		/*
-		 * Make sure that the guest sees a monotonically
-		 * increasing TSC.
-		 */
-		delta = vcpu->arch.host_tsc - native_read_tsc();
-		svm->vmcb->control.tsc_offset += delta;
-		if (is_nested(svm))
-			svm->nested.hsave->control.tsc_offset += delta;
+		if (check_tsc_unstable()) {
+			/*
+			 * Make sure that the guest sees a monotonically
+			 * increasing TSC.
+			 */
+			delta = vcpu->arch.host_tsc - native_read_tsc();
+			svm->vmcb->control.tsc_offset += delta;
+			if (is_nested(svm))
+				svm->nested.hsave->control.tsc_offset += delta;
+		}
 		vcpu->cpu = cpu;
 		kvm_migrate_timers(vcpu);
 		svm->asid_generation = 0;