summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2019-11-08 11:27:29 +0000
committerMarc Zyngier <maz@kernel.org>2019-11-08 11:27:29 +0000
commitcd7056ae34af0e9424da97bbc7d2b38246ba8a2c (patch)
treeeefb53f37554ebacf3a91a512839b6b6afbe75f4 /arch/arm/include
parenta4b28f5c67983d92c911ca1404728bc4ea958c0e (diff)
parentef2e78ddadbb939ce79553b10dee0131d65d8f3e (diff)
downloadlinux-cd7056ae34af0e9424da97bbc7d2b38246ba8a2c.tar.bz2
Merge remote-tracking branch 'kvmarm/misc-5.5' into kvmarm/next
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/kvm_emulate.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
index e8ef349c04b4..9b118516d2db 100644
--- a/arch/arm/include/asm/kvm_emulate.h
+++ b/arch/arm/include/asm/kvm_emulate.h
@@ -95,12 +95,12 @@ static inline unsigned long *vcpu_hcr(const struct kvm_vcpu *vcpu)
return (unsigned long *)&vcpu->arch.hcr;
}
-static inline void vcpu_clear_wfe_traps(struct kvm_vcpu *vcpu)
+static inline void vcpu_clear_wfx_traps(struct kvm_vcpu *vcpu)
{
vcpu->arch.hcr &= ~HCR_TWE;
}
-static inline void vcpu_set_wfe_traps(struct kvm_vcpu *vcpu)
+static inline void vcpu_set_wfx_traps(struct kvm_vcpu *vcpu)
{
vcpu->arch.hcr |= HCR_TWE;
}