diff options
| author | Marc Zyngier <maz@kernel.org> | 2022-05-04 10:42:16 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2022-05-04 10:42:16 +0200 |
| commit | b2c4caf3316ce535af333bbd2cd99ad96f991074 (patch) | |
| tree | 33bd05ec99caab3a0cab27f7f65f2fed2b64d9f2 /include | |
| parent | Merge remote-tracking branch 'arm64/for-next/sme' into kvmarm-master/next (diff) | |
| parent | KVM: arm64: Expose the WFXT feature to guests (diff) | |
| download | linux-b2c4caf3316ce535af333bbd2cd99ad96f991074.tar.xz linux-b2c4caf3316ce535af333bbd2cd99ad96f991074.zip | |
Merge branch kvm-arm64/wfxt into kvmarm-master/next
* kvm-arm64/wfxt:
: .
: Add support for the WFET/WFIT instructions that provide the same
: service as WFE/WFI, only with a timeout.
: .
KVM: arm64: Expose the WFXT feature to guests
KVM: arm64: Offer early resume for non-blocking WFxT instructions
KVM: arm64: Handle blocking WFIT instruction
KVM: arm64: Introduce kvm_counter_compute_delta() helper
KVM: arm64: Simplify kvm_cpu_has_pending_timer()
arm64: Use WFxT for __delay() when possible
arm64: Add wfet()/wfit() helpers
arm64: Add HWCAP advertising FEAT_WFXT
arm64: Add RV and RN fields for ESR_ELx_WFx_ISS
arm64: Expand ESR_ELx_WFx_ISS_TI to match its ARMv8.7 definition
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/kvm/arm_arch_timer.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index 51c19381108c..cd6d8f260eab 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -76,8 +76,6 @@ int kvm_arm_timer_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr); int kvm_arm_timer_get_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr); int kvm_arm_timer_has_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr); -bool kvm_timer_is_pending(struct kvm_vcpu *vcpu); - u64 kvm_phys_timer_read(void); void kvm_timer_vcpu_load(struct kvm_vcpu *vcpu); |