diff options
| author |   Marc Zyngier <maz@kernel.org> | 2020-07-28 16:26:16 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-07-28 16:26:16 +0100 |
| commit | a394cf6e854d40968d43693597532a242019e337 (patch) | |
| tree | 7bf6e1db24c7cabeccfafe6001c91daa642412f4 /arch/arm64/kvm/hyp/vgic-v3-sr.c | |
| parent | Merge branch 'kvm-arm64/target-table-no-more' into kvmarm-master/next-WIP (diff) | |
| parent | KVM: arm64: Substitute RANDOMIZE_BASE for HARDEN_EL2_VECTORS (diff) | |
| download | linux-dev-a394cf6e854d40968d43693597532a242019e337.tar.xz linux-dev-a394cf6e854d40968d43693597532a242019e337.zip | |
Merge branch 'kvm-arm64/misc-5.9' into kvmarm-master/next-WIP
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/hyp/vgic-v3-sr.c')
| -rw-r--r-- | arch/arm64/kvm/hyp/vgic-v3-sr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp/vgic-v3-sr.c b/arch/arm64/kvm/hyp/vgic-v3-sr.c index d31eb6266f2e..5a0073511efb 100644 --- a/arch/arm64/kvm/hyp/vgic-v3-sr.c +++ b/arch/arm64/kvm/hyp/vgic-v3-sr.c @@ -426,7 +426,7 @@ static int __vgic_v3_bpr_min(void) static int __vgic_v3_get_group(struct kvm_vcpu *vcpu) { - u32 esr = kvm_vcpu_get_hsr(vcpu); + u32 esr = kvm_vcpu_get_esr(vcpu); u8 crm = (esr & ESR_ELx_SYS64_ISS_CRM_MASK) >> ESR_ELx_SYS64_ISS_CRM_SHIFT; return crm != 8; @@ -978,7 +978,7 @@ int __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu) bool is_read; u32 sysreg; - esr = kvm_vcpu_get_hsr(vcpu); + esr = kvm_vcpu_get_esr(vcpu); if (vcpu_mode_is_32bit(vcpu)) { if (!kvm_condition_valid(vcpu)) { __kvm_skip_instr(vcpu); |