diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-03-14 14:47:56 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-03-14 14:47:56 -0400 |
| commit | 17193ced2dad52e7f1848945baaf3a71f44f424d (patch) | |
| tree | cf8e6e7c56b009b7023ad5d4265c4d39556f2563 /arch/s390/kvm/interrupt.c | |
| parent | e9a2bba476c8332ed547fce485c158d03b0b9659 (diff) | |
| parent | 00de073e2420df02ac0f1a19dbfb60ff8eb198be (diff) | |
| download | linux-17193ced2dad52e7f1848945baaf3a71f44f424d.tar.gz linux-17193ced2dad52e7f1848945baaf3a71f44f424d.tar.bz2 linux-17193ced2dad52e7f1848945baaf3a71f44f424d.zip | |
Merge tag 'kvm-s390-next-6.9-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
- Memop selftest rotate fix
- SCLP event bits over indication fix
- Missing virt_to_phys for the CRYCB fix
Diffstat (limited to 'arch/s390/kvm/interrupt.c')
| -rw-r--r-- | arch/s390/kvm/interrupt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index fc4007cc067a..20e080e9150b 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -1031,7 +1031,7 @@ static int __must_check __deliver_service_ev(struct kvm_vcpu *vcpu) return 0; } ext = fi->srv_signal; - /* only clear the event bit */ + /* only clear the event bits */ fi->srv_signal.ext_params &= ~SCCB_EVENT_PENDING; clear_bit(IRQ_PEND_EXT_SERVICE_EV, &fi->pending_irqs); spin_unlock(&fi->lock); @@ -1041,7 +1041,7 @@ static int __must_check __deliver_service_ev(struct kvm_vcpu *vcpu) trace_kvm_s390_deliver_interrupt(vcpu->vcpu_id, KVM_S390_INT_SERVICE, ext.ext_params, 0); - return write_sclp(vcpu, SCCB_EVENT_PENDING); + return write_sclp(vcpu, ext.ext_params & SCCB_EVENT_PENDING); } static int __must_check __deliver_pfault_done(struct kvm_vcpu *vcpu) |