---

yaml --- r: 68415 b: refs/heads/master c: 5cd4f6f h: refs/heads/master i: 68413: d93065f 68411: 134a74d 68407: cf1ade0 68399: 17c10cf 68383: 9fcf42a 68351: fc9b973 v: v3
git-mirror · Oct 13, 2007 · f8c7535 · f8c7535
1 parent 7622acf
commit f8c7535
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3d7f85f471f889e4477863a7ca42828ae74e77d
+refs/heads/master: 5cd4f6fd8506f59cb8a232f364c54f6bd8e5150a
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
@@ -2005,7 +2005,8 @@ static int kvm_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 		sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
 
 	/* re-sync apic's tpr */
-	set_cr8(vcpu, kvm_run->cr8);
+	if (!irqchip_in_kernel(vcpu->kvm))
+		set_cr8(vcpu, kvm_run->cr8);
 
 	if (vcpu->pio.cur_count) {
 		r = complete_pio(vcpu);