X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Fs390%2Fkvm%2Finterrupt.c;h=1058240b3db3dae3e33dd513876d297f1e60c30b;hb=fee0e0fdb2b9c221a3621bede722aa9f9c9f0d39;hp=ab9f525aa7cd8afb2c737957e9dbd31167d1b049;hpb=f59922b47e0a202386c8e8dcf9f0235b8a028ae0;p=deliverable%2Flinux.git

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index ab9f525aa7cd..1058240b3db3 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -51,11 +51,9 @@ static int psw_mchk_disabled(struct kvm_vcpu *vcpu)
 
 static int psw_interrupts_disabled(struct kvm_vcpu *vcpu)
 {
-	if ((vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PER) ||
-	    (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_IO) ||
-	    (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_EXT))
-		return 0;
-	return 1;
+	return psw_extint_disabled(vcpu) &&
+	       psw_ioint_disabled(vcpu) &&
+	       psw_mchk_disabled(vcpu);
 }
 
 static int ckc_interrupts_enabled(struct kvm_vcpu *vcpu)