1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c
index 951f3ebaff26..525c01f48867 100644
--- a/arch/arm64/kvm/hyp/switch.c
+++ b/arch/arm64/kvm/hyp/switch.c
@@ -304,7 +304,7 @@ int __hyp_text __kvm_vcpu_run(struct kvm_vcpu *vcpu)
         __activate_vm(vcpu);
 
         __vgic_restore_state(vcpu);
-        __timer_restore_state(vcpu);
+        __timer_enable_traps(vcpu);
 
         /*
          * We must restore the 32-bit state before the sysregs, thanks
@@ -374,7 +374,7 @@ again:
 
         __sysreg_save_guest_state(guest_ctxt);
         __sysreg32_save_state(vcpu);
-        __timer_save_state(vcpu);
+        __timer_disable_traps(vcpu);
         __vgic_save_state(vcpu);
 
         __deactivate_traps(vcpu);
@@ -442,7 +442,7 @@ void __hyp_text __noreturn __hyp_panic(void)
 
                 vcpu = (struct kvm_vcpu *)read_sysreg(tpidr_el2);
                 host_ctxt = kern_hyp_va(vcpu->arch.host_cpu_context);
-                __timer_save_state(vcpu);
+                __timer_disable_traps(vcpu);
                 __deactivate_traps(vcpu);
                 __deactivate_vm(vcpu);
                 __sysreg_restore_host_state(host_ctxt);