commit cc98702c1775a9ff3d943674c97d9561cf605fcd
author Marc Zyngier <maz@kernel.org> Tue Mar 24 12:45:27 2020 +0000
committer Marc Zyngier <maz@kernel.org> Tue Mar 24 12:45:27 2020 +0000
tree fbc3f129b173e6f31343cb73a9fb4d79754f0d4c
parent 76a5db107273b1ad01471e48c49635e2b944a7f4
parent dab4fe3bf6dd87a7d6dbab2c929afd1ef62a120b

Merge branch 'kvm-arm64/gic-v4.1' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>

virt/kvm/arm/arch_timer.c

diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 0d9438e..93bd59b 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -788,7 +788,7 @@ u64 kvm_arm_timer_get_reg(struct kvm_vcpu *vcpu, u64 regid)
 					  vcpu_ptimer(vcpu), TIMER_REG_CTL);
 	case KVM_REG_ARM_PTIMER_CNT:
 		return kvm_arm_timer_read(vcpu,
-					  vcpu_vtimer(vcpu), TIMER_REG_CNT);
+					  vcpu_ptimer(vcpu), TIMER_REG_CNT);
 	case KVM_REG_ARM_PTIMER_CVAL:
 		return kvm_arm_timer_read(vcpu,
 					  vcpu_ptimer(vcpu), TIMER_REG_CVAL);