From f8c7535f6f86095b93d6fcdfe786c91d502258fb Mon Sep 17 00:00:00 2001
From: "He, Qing" <qing.he@intel.com>
Date: Thu, 30 Aug 2007 17:04:26 +0800
Subject: [PATCH] --- yaml --- r: 68415 b: refs/heads/master c:
 5cd4f6fd8506f59cb8a232f364c54f6bd8e5150a h: refs/heads/master i:   68413:
 d93065f1559f459400df131098db947fc7296021   68411:
 134a74d85327bc4a915ba2bdb9ccce4960f3419a   68407:
 cf1ade0b3add691480cb6a05e081d44e320de74d   68399:
 17c10cf9dad1ccd50d2f2a46b630fc94b76571f1   68383:
 9fcf42a1d220f7d15f95cff8e1f81b0fbb8eb7c4   68351:
 fc9b9738055c1749ecc90c13c75e0b2895aa7b0c v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/kvm/kvm_main.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a05d25ef56e0..eb7b81de6987 100644
--- 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
index 8f8bfc9160e3..02af24e8350c 100644
--- 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);