aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm/kvm-s390.c
diff options
context:
space:
mode:
authorCarsten Otte <cotte@de.ibm.com>2012-01-04 04:25:25 -0500
committerAvi Kivity <avi@redhat.com>2012-03-05 07:52:19 -0500
commitd6b6d166864fa97ca3b1ed1a5c62fd3b53d4606f (patch)
tree6f772746ed159b26da04888c1bd0fa09e1732b71 /arch/s390/kvm/kvm-s390.c
parentc0d744a9c8aae81b624e0650e6fbbbb83db1a145 (diff)
KVM: s390: ucontrol: disable in-kernel irq stack
This patch disables the in-kernel interrupt stack for KVM virtual machines that are controlled by user. Userspace has to take care of handling interrupts on its own. Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
-rw-r--r--arch/s390/kvm/kvm-s390.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 02510946864e..5b5c28e471df 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -505,7 +505,8 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)
505 if (test_thread_flag(TIF_MCCK_PENDING)) 505 if (test_thread_flag(TIF_MCCK_PENDING))
506 s390_handle_mcck(); 506 s390_handle_mcck();
507 507
508 kvm_s390_deliver_pending_interrupts(vcpu); 508 if (!kvm_is_ucontrol(vcpu->kvm))
509 kvm_s390_deliver_pending_interrupts(vcpu);
509 510
510 vcpu->arch.sie_block->icptcode = 0; 511 vcpu->arch.sie_block->icptcode = 0;
511 local_irq_disable(); 512 local_irq_disable();