summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorChristoffer Dall <christoffer.dall@linaro.org>2014-11-24 10:41:56 +0100
committerMarc Zyngier <marc.zyngier@arm.com>2014-11-25 13:57:28 +0000
commitb1e952b4e484ebc9ffad674c361d261a1af02a13 (patch)
tree24833551fcd373823e983c4c220251d6591c028c /virt
parent5100f9833e1881c800bc088e70afa4b9a1409f51 (diff)
downloadlinux-stable-b1e952b4e484ebc9ffad674c361d261a1af02a13.tar.gz
linux-stable-b1e952b4e484ebc9ffad674c361d261a1af02a13.tar.bz2
linux-stable-b1e952b4e484ebc9ffad674c361d261a1af02a13.zip
arm/arm64: vgic: Remove unreachable irq_clear_pending
When 'injecting' an edge-triggered interrupt with a falling edge we shouldn't clear the pending state on the distributor. In fact, we don't, because the check in vgic_validate_injection would prevent us from ever reaching this bit of code. Remove the unreachable snippet. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/arm/vgic.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 5acf2c93f616..631a472e41cf 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -1643,8 +1643,6 @@ static bool vgic_update_irq_pending(struct kvm *kvm, int cpuid,
vgic_dist_irq_clear_level(vcpu, irq_num);
if (!vgic_dist_irq_soft_pend(vcpu, irq_num))
vgic_dist_irq_clear_pending(vcpu, irq_num);
- } else {
- vgic_dist_irq_clear_pending(vcpu, irq_num);
}
ret = false;