Merge branch kvm-arm64/misc-5.20 into kvmarm-master/next

[sfrench/cifs-2.6.git] / arch / arm64 / kvm / hyp / vhe / switch.c

diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c
index 969f20daf97aabb9b8dd67c7eec8e7272e1953d9..7acb87eaa0925a75e6f1843fd80b925bad0d3c85 100644 (file)
--- a/arch/arm64/kvm/hyp/vhe/switch.c
+++ b/arch/arm64/kvm/hyp/vhe/switch.c
@@ -55,7 +55,7 @@ static void __activate_traps(struct kvm_vcpu *vcpu)
 
        val |= CPTR_EL2_TAM;
 
-       if (update_fp_enabled(vcpu)) {
+       if (guest_owns_fp_regs(vcpu)) {
                if (vcpu_has_sve(vcpu))
                        val |= CPACR_EL1_ZEN_EL0EN | CPACR_EL1_ZEN_EL1EN;
        } else {
@@ -175,7 +175,7 @@ static int __kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu)
 
        sysreg_restore_host_state_vhe(host_ctxt);
 
-       if (vcpu->arch.flags & KVM_ARM64_FP_ENABLED)
+       if (vcpu->arch.fp_state == FP_STATE_GUEST_OWNED)
                __fpsimd_save_fpexc32(vcpu);
 
        __debug_switch_to_host(vcpu);
@@ -249,5 +249,5 @@ void __noreturn hyp_panic(void)
 
 asmlinkage void kvm_unexpected_el2_exception(void)
 {
-       return __kvm_unexpected_el2_exception();
+       __kvm_unexpected_el2_exception();
 }