---

yaml --- r: 297053 b: refs/heads/master c: d6b6d16 h: refs/heads/master i: 297051: f154570 v: v3
git-mirror · Mar 5, 2012 · 96dad4b · 96dad4b
1 parent 7e7ab0b
commit 96dad4b
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: c0d744a9c8aae81b624e0650e6fbbbb83db1a145
+refs/heads/master: d6b6d166864fa97ca3b1ed1a5c62fd3b53d4606f
diff --git a/trunk/arch/s390/kvm/kvm-s390.c b/trunk/arch/s390/kvm/kvm-s390.c
@@ -505,7 +505,8 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)
 	if (test_thread_flag(TIF_MCCK_PENDING))
 		s390_handle_mcck();
 
-	kvm_s390_deliver_pending_interrupts(vcpu);
+	if (!kvm_is_ucontrol(vcpu->kvm))
+		kvm_s390_deliver_pending_interrupts(vcpu);
 
 	vcpu->arch.sie_block->icptcode = 0;
 	local_irq_disable();