1 files changed, 4 insertions, 3 deletions

diff --git a/arch/arm/kvm/hyp/switch.c b/arch/arm/kvm/hyp/switch.c
index ebd2dd46adf7..330c9ce34ba5 100644
--- a/arch/arm/kvm/hyp/switch.c
+++ b/arch/arm/kvm/hyp/switch.c
@@ -174,7 +174,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);
 
         __sysreg_restore_state(guest_ctxt);
         __banked_restore_state(guest_ctxt);
@@ -191,7 +191,8 @@ again:
 
         __banked_save_state(guest_ctxt);
         __sysreg_save_state(guest_ctxt);
-        __timer_save_state(vcpu);
+        __timer_disable_traps(vcpu);
+
         __vgic_save_state(vcpu);
 
         __deactivate_traps(vcpu);
@@ -237,7 +238,7 @@ void __hyp_text __noreturn __hyp_panic(int cause)
 
                 vcpu = (struct kvm_vcpu *)read_sysreg(HTPIDR);
                 host_ctxt = kern_hyp_va(vcpu->arch.host_cpu_context);
-                __timer_save_state(vcpu);
+                __timer_disable_traps(vcpu);
                 __deactivate_traps(vcpu);
                 __deactivate_vm(vcpu);
                 __banked_restore_state(host_ctxt);