From 646ddc67535f996b2b74dd2fe60e8df4ee20fd66 Mon Sep 17 00:00:00 2001
From: Zachary Amsden <zamsden@gmail.com>
Date: Fri, 3 Feb 2012 15:43:52 -0200
Subject: [PATCH] --- yaml --- r: 297137 b: refs/heads/master c:
 4dd7980b21408624e9b6f3df05719c3c61db6e9f h: refs/heads/master i:   297135:
 5d6310aea2f4dd4f452576b954aa3beacfc88c24 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ebe5b2df7719..af9d1697cf1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d3cb0f6a8e3af018a522ae8d36f8f7d2511b5d8
+refs/heads/master: 4dd7980b21408624e9b6f3df05719c3c61db6e9f
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 4390f42b371f..030d495e5c78 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -1067,7 +1067,6 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, u64 data)
 			offset = kvm_x86_ops->compute_tsc_offset(vcpu, data);
 			pr_debug("kvm: adjusted tsc offset by %llu\n", delta);
 		}
-		ns = kvm->arch.last_tsc_nsec;
 	}
 	kvm->arch.last_tsc_nsec = ns;
 	kvm->arch.last_tsc_write = data;