---

yaml --- r: 68367 b: refs/heads/master c: 9bd0150 h: refs/heads/master i: 68365: e0de84e 68363: 0d1d474 68359: 97b3eef 68351: fc9b973 v: v3
git-mirror · Oct 13, 2007 · 541cfb6 · 541cfb6
1 parent 11c47db
commit 541cfb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11ec2804711896546ee3c945f3786c7f9fdd175a
+refs/heads/master: 9bd01506ee551689b90ba5822c28ef55207146af
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
@@ -693,10 +693,13 @@ void fx_init(struct kvm_vcpu *vcpu)
 
 	} *fx_image;
 
+	/* Initialize guest FPU by resetting ours and saving into guest's */
+	preempt_disable();
 	fx_save(vcpu->host_fx_image);
 	fpu_init();
 	fx_save(vcpu->guest_fx_image);
 	fx_restore(vcpu->host_fx_image);
+	preempt_enable();
 
 	fx_image = (struct fx_image_s *)vcpu->guest_fx_image;
 	fx_image->mxcsr = 0x1f80;