diff options
| author | Clark Williams <williams@redhat.com> | 2020-06-06 23:23:28 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2020-06-06 23:23:28 -0500 |
| commit | af34474d3a7388f36ff056575b13c26655a5fb13 (patch) | |
| tree | 310d7c322b4792ee615bffbf3e746a24bf49fdae /virt | |
| parent | bd9ff5bf81a22385c17e9bd8eec3d560dfa5e0d2 (diff) | |
| parent | a41ba30d9df20fe141c92aacbb56b6b077f19716 (diff) | |
| download | linux-rt-af34474d3a7388f36ff056575b13c26655a5fb13.tar.gz | |
Merge tag 'v4.14.181' into v4.14-rt
This is the 4.14.181 stable release
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-mmio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/virt/kvm/arm/vgic/vgic-mmio.c b/virt/kvm/arm/vgic/vgic-mmio.c index 63c6b630174f..d2003d149bdf 100644 --- a/virt/kvm/arm/vgic/vgic-mmio.c +++ b/virt/kvm/arm/vgic/vgic-mmio.c @@ -260,7 +260,7 @@ static void vgic_mmio_change_active(struct kvm_vcpu *vcpu, struct vgic_irq *irq, static void vgic_change_active_prepare(struct kvm_vcpu *vcpu, u32 intid) { if (vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3 || - intid > VGIC_NR_PRIVATE_IRQS) + intid >= VGIC_NR_PRIVATE_IRQS) kvm_arm_halt_guest(vcpu->kvm); } @@ -268,7 +268,7 @@ static void vgic_change_active_prepare(struct kvm_vcpu *vcpu, u32 intid) static void vgic_change_active_finish(struct kvm_vcpu *vcpu, u32 intid) { if (vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3 || - intid > VGIC_NR_PRIVATE_IRQS) + intid >= VGIC_NR_PRIVATE_IRQS) kvm_arm_resume_guest(vcpu->kvm); } |