From 78d2b5c466ddd3860871da046324a706ac9a1321 Mon Sep 17 00:00:00 2001 From: Zachary Amsden Date: Thu, 19 Aug 2010 22:07:24 -1000 Subject: [PATCH] --- yaml --- r: 215767 b: refs/heads/master c: 48434c20e18d59001469699fcaaf9cf30b815a20 h: refs/heads/master i: 215765: 3dc1124972daf4156c3c037994670712f0cf711c 215763: c3d7a5283382d5238ef23cd900ad3ab38b473753 215759: 607a9cabd144acf4de156bc345a6f10c9a5bb67a v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/x86.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a61fe7e85b79..0ab7107ac972 100644 --- 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 index 468fafaed1ae..9396b3f2c594 100644 --- 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;