diff options
| author | Joerg Roedel <[email protected]> | 2023-10-26 17:05:58 +0200 |
|---|---|---|
| committer | Joerg Roedel <[email protected]> | 2023-10-26 17:05:58 +0200 |
| commit | 3613047280ec42a4e1350fdc1a6dd161ff4008cc (patch) | |
| tree | 6cf2f03f518537f3229e6066a8b2638755f0bb48 /include/kvm/arm_arch_timer.h | |
| parent | bbc70e0aec287e164344b1a071bd46466a4f29b3 (diff) | |
| parent | 05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1 (diff) | |
Merge tag 'v6.6-rc7' into core
Linux 6.6-rc7
Diffstat (limited to 'include/kvm/arm_arch_timer.h')
| -rw-r--r-- | include/kvm/arm_arch_timer.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index bb3cb005873e..e748bc957d83 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -82,6 +82,8 @@ struct timer_map { struct arch_timer_context *emul_ptimer; }; +void get_timer_map(struct kvm_vcpu *vcpu, struct timer_map *map); + struct arch_timer_cpu { struct arch_timer_context timers[NR_KVM_TIMERS]; @@ -145,4 +147,9 @@ u64 timer_get_cval(struct arch_timer_context *ctxt); void kvm_timer_cpu_up(void); void kvm_timer_cpu_down(void); +static inline bool has_cntpoff(void) +{ + return (has_vhe() && cpus_have_final_cap(ARM64_HAS_ECV_CNTPOFF)); +} + #endif |