diff options
author | Andre Przywara <andre.przywara@arm.com> | 2016-04-13 05:04:06 -0400 |
---|---|---|
committer | Christoffer Dall <christoffer.dall@linaro.org> | 2016-05-20 09:39:38 -0400 |
commit | 63306c28ac92bdf9e41aef367708d762f9f725f2 (patch) | |
tree | 1140f90b5d86d20ccfb19fe9fae5e93a6df457d5 /virt/kvm/arm/arch_timer.c | |
parent | e262f4193638fff2de458f0c70284f0cb50926a7 (diff) |
KVM: arm/arm64: vgic: avoid map in kvm_vgic_unmap_phys_irq()
kvm_vgic_unmap_phys_irq() only needs the virtual IRQ number, so let's
just pass that between the arch timer and the VGIC to get rid of
the irq_phys_map pointer.
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>
Diffstat (limited to 'virt/kvm/arm/arch_timer.c')
-rw-r--r-- | virt/kvm/arm/arch_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 37f82c1c6bb7..962b442d0d77 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c | |||
@@ -486,7 +486,7 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) | |||
486 | 486 | ||
487 | timer_disarm(timer); | 487 | timer_disarm(timer); |
488 | if (timer->map) | 488 | if (timer->map) |
489 | kvm_vgic_unmap_phys_irq(vcpu, timer->map); | 489 | kvm_vgic_unmap_phys_irq(vcpu, timer->map->virt_irq); |
490 | } | 490 | } |
491 | 491 | ||
492 | void kvm_timer_enable(struct kvm *kvm) | 492 | void kvm_timer_enable(struct kvm *kvm) |