diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-01-17 17:04:59 +0300 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-01-17 17:04:59 +0300 |
| commit | 1b1973ef9a6a951903c1d7701f0c420b27e77cf3 (patch) | |
| tree | afcfd18b45a7dc163cce3e77a8ee9ec6edf04720 /include | |
| parent | 49def1853334396f948dcb4cedb9347abb318df5 (diff) | |
| parent | 1193e6aeecb36c74c48c7cd0f641acbbed9ddeef (diff) | |
| download | linux-1b1973ef9a6a951903c1d7701f0c420b27e77cf3.tar.xz | |
Merge tag 'kvm-arm-for-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM updates for 4.10-rc4
- Fix for timer setup on VHE machines
- Drop spurious warning when the timer races against
the vcpu running again
- Prevent a vgic deadlock when the initialization fails
Diffstat (limited to 'include')
| -rw-r--r-- | include/kvm/arm_arch_timer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index b717ed9d2b75..5c970ce67949 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -76,4 +76,5 @@ void kvm_timer_unschedule(struct kvm_vcpu *vcpu); void kvm_timer_vcpu_put(struct kvm_vcpu *vcpu); +void kvm_timer_init_vhe(void); #endif |