Commit 0f4828a1 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-arm-for-4.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm 

KVM/ARM updates for v4.9-rc7

- Do not call kvm_notify_acked for PPIs
parents e5517c2a 8ca18eec

virt/kvm/arm/vgic/vgic-v2.c

+4 −2
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ void vgic_v2_process_maintenance(struct kvm_vcpu *vcpu) 


			WARN_ON(cpuif->vgic_lr[lr] & GICH_LR_STATE);



			/* Only SPIs require notification */

			if (vgic_valid_spi(vcpu->kvm, intid))

				kvm_notify_acked_irq(vcpu->kvm, 0,

						     intid - VGIC_NR_PRIVATE_IRQS);

		}

virt/kvm/arm/vgic/vgic-v3.c

+4 −2
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ void vgic_v3_process_maintenance(struct kvm_vcpu *vcpu) 


			WARN_ON(cpuif->vgic_lr[lr] & ICH_LR_STATE);



			/* Only SPIs require notification */

			if (vgic_valid_spi(vcpu->kvm, intid))

				kvm_notify_acked_irq(vcpu->kvm, 0,

						     intid - VGIC_NR_PRIVATE_IRQS);

		}