KVM: arm64: Simplify handling of ARCH_WORKAROUND_2

[linux-2.6-microblaze.git] / arch / arm64 / kvm / hypercalls.c

diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
index 413d46b..69e023d 100644 (file)
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@ -36,15 +36,13 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)
                        }
                        break;
                case ARM_SMCCC_ARCH_WORKAROUND_2:
-                       switch (kvm_arm_have_ssbd()) {
-                       case KVM_SSBD_FORCE_DISABLE:
-                       case KVM_SSBD_UNKNOWN:
+                       switch (arm64_get_ssbd_state()) {
+                       case ARM64_SSBD_FORCE_DISABLE:
+                       case ARM64_SSBD_UNKNOWN:
                                break;
-                       case KVM_SSBD_KERNEL:
-                               val = SMCCC_RET_SUCCESS;
-                               break;
-                       case KVM_SSBD_FORCE_ENABLE:
-                       case KVM_SSBD_MITIGATED:
+                       case ARM64_SSBD_KERNEL:
+                       case ARM64_SSBD_FORCE_ENABLE:
+                       case ARM64_SSBD_MITIGATED:
                                val = SMCCC_RET_NOT_REQUIRED;
                                break;
                        }