Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[platform/kernel/linux-rpi.git] / arch / arm64 / kvm / reset.c

diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c
index 25e0041..ecc40c8 100644 (file)
--- a/arch/arm64/kvm/reset.c
+++ b/arch/arm64/kvm/reset.c
@@ -52,10 +52,10 @@ int kvm_arm_init_sve(void)
                 * The get_sve_reg()/set_sve_reg() ioctl interface will need
                 * to be extended with multiple register slice support in
                 * order to support vector lengths greater than
-                * SVE_VL_ARCH_MAX:
+                * VL_ARCH_MAX:
                 */
-               if (WARN_ON(kvm_sve_max_vl > SVE_VL_ARCH_MAX))
-                       kvm_sve_max_vl = SVE_VL_ARCH_MAX;
+               if (WARN_ON(kvm_sve_max_vl > VL_ARCH_MAX))
+                       kvm_sve_max_vl = VL_ARCH_MAX;
 
                /*
                 * Don't even try to make use of vector lengths that
@@ -105,7 +105,7 @@ static int kvm_vcpu_finalize_sve(struct kvm_vcpu *vcpu)
         * set_sve_vls().  Double-check here just to be sure:
         */
        if (WARN_ON(!sve_vl_valid(vl) || vl > sve_max_virtualisable_vl() ||
-                   vl > SVE_VL_ARCH_MAX))
+                   vl > VL_ARCH_MAX))
                return -EIO;
 
        reg_sz = vcpu_sve_state_size(vcpu);