aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2016-04-13 04:43:59 -0400
committerChristoffer Dall <christoffer.dall@linaro.org>2016-05-20 09:39:37 -0400
commit7cbc084dc22ca4adb8fd741502e43f29b577abfb (patch)
treeb11966f5b6013293ee14e1440cddf5edcc983239
parente4fe9e7dc3828bf6a5714eb3c55aef6260d823a2 (diff)
KVM: arm/arm64: vgic: streamline vgic_update_irq_pending() interface
We actually don't use the irq_phys_map parameter in vgic_update_irq_pending(), so let's just remove it. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Eric Auger <eric.auger@linaro.org> Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-rw-r--r--virt/kvm/arm/vgic.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 60668a7f319a..f6c61720763d 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -1521,7 +1521,6 @@ static int vgic_validate_injection(struct kvm_vcpu *vcpu, int irq, int level)
1521} 1521}
1522 1522
1523static int vgic_update_irq_pending(struct kvm *kvm, int cpuid, 1523static int vgic_update_irq_pending(struct kvm *kvm, int cpuid,
1524 struct irq_phys_map *map,
1525 unsigned int irq_num, bool level) 1524 unsigned int irq_num, bool level)
1526{ 1525{
1527 struct vgic_dist *dist = &kvm->arch.vgic; 1526 struct vgic_dist *dist = &kvm->arch.vgic;
@@ -1660,7 +1659,7 @@ int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int irq_num,
1660 if (map) 1659 if (map)
1661 return -EINVAL; 1660 return -EINVAL;
1662 1661
1663 return vgic_update_irq_pending(kvm, cpuid, NULL, irq_num, level); 1662 return vgic_update_irq_pending(kvm, cpuid, irq_num, level);
1664} 1663}
1665 1664
1666/** 1665/**
@@ -1686,7 +1685,7 @@ int kvm_vgic_inject_mapped_irq(struct kvm *kvm, int cpuid,
1686 if (ret) 1685 if (ret)
1687 return ret; 1686 return ret;
1688 1687
1689 return vgic_update_irq_pending(kvm, cpuid, map, map->virt_irq, level); 1688 return vgic_update_irq_pending(kvm, cpuid, map->virt_irq, level);
1690} 1689}
1691 1690
1692static irqreturn_t vgic_maintenance_handler(int irq, void *data) 1691static irqreturn_t vgic_maintenance_handler(int irq, void *data)