diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-07-30 16:13:04 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-07-30 16:13:04 +0100 |
| commit | 16314874b12b451bd5a1df86bcb69745eb487502 (patch) | |
| tree | ef70b8e564989ee2418834e6fb6c2fd553b43143 /arch/arm64/kvm/hyp | |
| parent | 236a559919c44999ae64826fb1743e18ab4bc25c (diff) | |
| parent | 022c8328dc8021248047b373b9f67790641b8f2d (diff) | |
| download | lwn-16314874b12b451bd5a1df86bcb69745eb487502.tar.gz lwn-16314874b12b451bd5a1df86bcb69745eb487502.zip | |
Merge branch 'kvm-arm64/misc-5.9' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/hyp')
| -rw-r--r-- | arch/arm64/kvm/hyp/include/hyp/switch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h index 0511af14dc81..426ef65601dd 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -444,7 +444,7 @@ static inline bool fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) valid = kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_DABT_LOW && kvm_vcpu_trap_get_fault_type(vcpu) == FSC_FAULT && kvm_vcpu_dabt_isvalid(vcpu) && - !kvm_vcpu_dabt_isextabt(vcpu) && + !kvm_vcpu_abt_issea(vcpu) && !kvm_vcpu_dabt_iss1tw(vcpu); if (valid) { |