From 15d08e8cea53b2c139bc95977fc7c14aca2cde02 Mon Sep 17 00:00:00 2001 From: Herton Ronaldo Krzesinski Date: Mon, 12 Sep 2011 17:06:31 -0300 Subject: [PATCH] Revert "KVM: fix kvmclock regression due to missing clock update" This fix was not verified in the -proposed kernel to have resolved the problem, so the patch is being reverted. This reverts commit b2ad3e0e1b1eafeeff98bedda724a5962bb7ffaa. Signed-off-by: Herton Ronaldo Krzesinski --- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0556e05..980317a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2100,8 +2100,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) if (check_tsc_unstable()) { kvm_x86_ops->adjust_tsc_offset(vcpu, -tsc_delta); vcpu->arch.tsc_catchup = 1; + kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); } - kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); if (vcpu->cpu != cpu) kvm_migrate_timers(vcpu); vcpu->cpu = cpu; -- 1.7.10.4