From 96dad4b9a98bda1ca6174a0e6f50e586bca41d9f Mon Sep 17 00:00:00 2001
From: Carsten Otte <cotte@de.ibm.com>
Date: Wed, 4 Jan 2012 10:25:25 +0100
Subject: [PATCH] --- yaml --- r: 297053 b: refs/heads/master c:
 d6b6d166864fa97ca3b1ed1a5c62fd3b53d4606f h: refs/heads/master i:   297051:
 f1545707f482a3ed85ebd1a3ea96aa8cbe472617 v: v3

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

diff --git a/[refs] b/[refs]
index bc2db76a3f05..d3560a3ccccf 100644
--- 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
index 02510946864e..5b5c28e471df 100644
--- 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();