diff options
| author |   Jintack Lim <jintack@cs.columbia.edu> | 2017-02-03 10:20:01 -0500 |
|---|---|---|
| committer |   Marc Zyngier <marc.zyngier@arm.com> | 2017-02-08 15:13:33 +0000 |
| commit | 9171fa2e0951b0cb6c443e0dce2c4620de3b1dfe (patch) | |
| tree | 30f81e8e82eac5f8cffa83099df7f7552deb4eaf /arch/arm/kvm/arm.c | |
| parent | KVM: arm/arm64: Move cntvoff to each timer context (diff) | |
| download | linux-dev-9171fa2e0951b0cb6c443e0dce2c4620de3b1dfe.tar.xz linux-dev-9171fa2e0951b0cb6c443e0dce2c4620de3b1dfe.zip | |
KVM: arm/arm64: Decouple kvm timer functions from virtual timer
Now that we have a separate structure for timer context, make functions
generic so that they can work with any timer context, not just the
virtual timer context. This does not change the virtual timer
functionality.
Signed-off-by: Jintack Lim <jintack@cs.columbia.edu>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/kvm/arm.c')
| -rw-r--r-- | arch/arm/kvm/arm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index f93f2171a48b..0ecd6cf362fc 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -300,7 +300,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) { - return kvm_timer_should_fire(vcpu); + return kvm_timer_should_fire(vcpu_vtimer(vcpu)); } void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) |