---

yaml --- r: 297137 b: refs/heads/master c: 4dd7980 h: refs/heads/master i: 297135: 5d6310a v: v3
git-mirror · Mar 8, 2012 · 646ddc6 · 646ddc6
1 parent e9b427a
commit 646ddc6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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;