KVM: arm64: Fix caching of host MDCR_EL2 value

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / virt / kvm / arm / arm.c

diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index d5f1d83645716e37d70136a29644f54ecb353512..ed42b8cf6f5bd602322952a4754d81a0f28c7fa1 100644 (file)
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -1148,8 +1148,6 @@ static void cpu_init_hyp_mode(void *dummy)
 
        __cpu_init_hyp_mode(pgd_ptr, hyp_stack_ptr, vector_ptr);
        __cpu_init_stage2();
-
-       kvm_arm_init_debug();
 }
 
 static void cpu_hyp_reset(void)
@@ -1173,6 +1171,8 @@ static void cpu_hyp_reinit(void)
                cpu_init_hyp_mode(NULL);
        }
 
+       kvm_arm_init_debug();
+
        if (vgic_present)
                kvm_vgic_init_cpu_hardware();
 }