From 024206d25a88d820dc257b237fa8664c8549c499 Mon Sep 17 00:00:00 2001
From: Amit Shah <amit.shah@qumranet.com>
Date: Thu, 15 Nov 2007 18:38:46 +0200
Subject: [PATCH] --- yaml --- r: 80736 b: refs/heads/master c:
 9327fd1195b77e67b86db8c1c1c4c4f7db009b00 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/kvm/svm.c | 1 -
 trunk/drivers/kvm/vmx.c | 1 -
 trunk/drivers/kvm/x86.c | 1 +
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5a11fdbbf3b1..b1990eb2c569 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cee576493b6abc95cc7447a65f1b9d2b40b8f20
+refs/heads/master: 9327fd1195b77e67b86db8c1c1c4c4f7db009b00
diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c
index 0d32304944fc..fb3721d88dbf 100644
--- a/trunk/drivers/kvm/svm.c
+++ b/trunk/drivers/kvm/svm.c
@@ -659,7 +659,6 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu)
 		wrmsrl(host_save_user_msrs[i], svm->host_user_msrs[i]);
 
 	rdtscll(vcpu->host_tsc);
-	kvm_put_guest_fpu(vcpu);
 }
 
 static void svm_vcpu_decache(struct kvm_vcpu *vcpu)
diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
index 7130f315afdf..0c082faaa6db 100644
--- a/trunk/drivers/kvm/vmx.c
+++ b/trunk/drivers/kvm/vmx.c
@@ -541,7 +541,6 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 static void vmx_vcpu_put(struct kvm_vcpu *vcpu)
 {
 	vmx_load_host_state(to_vmx(vcpu));
-	kvm_put_guest_fpu(vcpu);
 }
 
 static void vmx_fpu_activate(struct kvm_vcpu *vcpu)
diff --git a/trunk/drivers/kvm/x86.c b/trunk/drivers/kvm/x86.c
index fdc7632d7620..9618fcba887e 100644
--- a/trunk/drivers/kvm/x86.c
+++ b/trunk/drivers/kvm/x86.c
@@ -678,6 +678,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
 {
 	kvm_x86_ops->vcpu_put(vcpu);
+	kvm_put_guest_fpu(vcpu);
 }
 
 static void cpuid_fix_nx_cap(struct kvm_vcpu *vcpu)