diff options
| author | Marc Zyngier <maz@kernel.org> | 2019-11-08 11:27:29 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2019-11-08 11:27:29 +0000 |
| commit | cd7056ae34af0e9424da97bbc7d2b38246ba8a2c (patch) | |
| tree | eefb53f37554ebacf3a91a512839b6b6afbe75f4 /arch/arm | |
| parent | a4b28f5c67983d92c911ca1404728bc4ea958c0e (diff) | |
| parent | ef2e78ddadbb939ce79553b10dee0131d65d8f3e (diff) | |
Merge remote-tracking branch 'kvmarm/misc-5.5' into kvmarm/next
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/kvm_emulate.h | 4 | ||||
| -rw-r--r-- | arch/arm/kvm/guest.c | 4 |
2 files changed, 6 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; } diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c index 735f9b007e58..0e6f23504c26 100644 --- a/arch/arm/kvm/guest.c +++ b/arch/arm/kvm/guest.c @@ -21,6 +21,10 @@ #define VCPU_STAT(x) { #x, offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU } struct kvm_stats_debugfs_item debugfs_entries[] = { + VCPU_STAT(halt_successful_poll), + VCPU_STAT(halt_attempted_poll), + VCPU_STAT(halt_poll_invalid), + VCPU_STAT(halt_wakeup), VCPU_STAT(hvc_exit_stat), VCPU_STAT(wfe_exit_stat), VCPU_STAT(wfi_exit_stat), |