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/include | |
| 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/include')
| -rw-r--r-- | arch/arm64/include/asm/kvm_emulate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index 5d96c3472390..49a55be2b9a2 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -345,7 +345,7 @@ static __always_inline u8 kvm_vcpu_trap_get_fault_type(const struct kvm_vcpu *vc return kvm_vcpu_get_esr(vcpu) & ESR_ELx_FSC_TYPE; } -static __always_inline bool kvm_vcpu_dabt_isextabt(const struct kvm_vcpu *vcpu) +static __always_inline bool kvm_vcpu_abt_issea(const struct kvm_vcpu *vcpu) { switch (kvm_vcpu_trap_get_fault(vcpu)) { case FSC_SEA: |