diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-31 09:44:21 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-31 09:44:21 +0000 |
| commit | ff114805e1dc9b64c1f2e02fbb07a6ed309b18d8 (patch) | |
| tree | 64407a783525686b864b3cd56292bf7e9d67d507 /arch/s390 | |
| parent | bfbceba4d4e9a3a538a80a1a0af18db55c9924a4 (diff) | |
| parent | 816b571ac0e9eb9700df1ebc99702f9ad04e8607 (diff) | |
Merge tag 'v3.10.59' into linux-linaro-lsk
This is the 3.10.59 stable release
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kvm/interrupt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 5c948177529e..bc79ab00536f 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -71,6 +71,7 @@ static int __interrupt_is_deliverable(struct kvm_vcpu *vcpu, return 0; if (vcpu->arch.sie_block->gcr[0] & 0x2000ul) return 1; + return 0; case KVM_S390_INT_EMERGENCY: if (psw_extint_disabled(vcpu)) return 0; |