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

[linux-2.6-microblaze.git] / arch / arm64 / include / asm / kvm_emulate.h

diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
index 13c948a..78a5505 100644 (file)
--- a/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h
@@ -76,14 +76,14 @@ static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)
        vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS;
        if (has_vhe() || has_hvhe())
                vcpu->arch.hcr_el2 |= HCR_E2H;
-       if (cpus_have_const_cap(ARM64_HAS_RAS_EXTN)) {
+       if (cpus_have_final_cap(ARM64_HAS_RAS_EXTN)) {
                /* route synchronous external abort exceptions to EL2 */
                vcpu->arch.hcr_el2 |= HCR_TEA;
                /* trap error record accesses */
                vcpu->arch.hcr_el2 |= HCR_TERR;
        }
 
-       if (cpus_have_const_cap(ARM64_HAS_STAGE2_FWB)) {
+       if (cpus_have_final_cap(ARM64_HAS_STAGE2_FWB)) {
                vcpu->arch.hcr_el2 |= HCR_FWB;
        } else {
                /*