On 22/06/2015 13:20, Christian Borntraeger wrote: > From: Jens Freimann <jfrei@xxxxxxxxxxxxxxxxxx> > > commit 6d3da24141 ("KVM: s390: deliver floating interrupts in order > of priority") introduced a regression for the reset handling. > > We don't clear the bitmap of pending floating interrupts > and interrupt parameters. This could result in stale interrupts > even after a reset. Let's fix this by clearing the pending bitmap > and the parameters for service and machine check interrupts. > > Cc: stable@xxxxxxxxxxxxxxx # 4.1 > Signed-off-by: Jens Freimann <jfrei@xxxxxxxxxxxxxxxxxx> > Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx> > --- > arch/s390/kvm/interrupt.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c > index 322ef9c..480b975 100644 > --- a/arch/s390/kvm/interrupt.c > +++ b/arch/s390/kvm/interrupt.c > @@ -1621,6 +1621,9 @@ void kvm_s390_clear_float_irqs(struct kvm *kvm) > int i; > > spin_lock(&fi->lock); > + fi->pending_irqs = 0; > + memset(&fi->srv_signal, 0, sizeof(fi->srv_signal)); > + memset(&fi->mchk, 0, sizeof(fi->mchk)); > for (i = 0; i < FIRQ_LIST_COUNT; i++) > clear_irq_list(&fi->lists[i]); > for (i = 0; i < FIRQ_MAX_COUNT; i++) > Applied, thanks. Paolo -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html