---

yaml --- r: 215767 b: refs/heads/master c: 48434c2 h: refs/heads/master i: 215765: 3dc1124 215763: c3d7a52 215759: 607a9ca v: v3
git-mirror · Oct 24, 2010 · 78d2b5c · 78d2b5c
1 parent 3287459
commit 78d2b5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e48672fa25e879f7ae21785c7efd187738139593
+refs/heads/master: 48434c20e18d59001469699fcaaf9cf30b815a20
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
@@ -1866,7 +1866,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 	}
 
 	kvm_x86_ops->vcpu_load(vcpu, cpu);
-	if (unlikely(vcpu->cpu != cpu)) {
+	if (unlikely(vcpu->cpu != cpu) || check_tsc_unstable()) {
 		/* Make sure TSC doesn't go backwards */
 		s64 tsc_delta = !vcpu->arch.last_host_tsc ? 0 :
 				native_read_tsc() - vcpu->arch.last_host_tsc;