diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-12-18 12:57:43 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-12-18 12:57:43 +0100 |
| commit | 43aabca38aa9668eee3c3c1206207034614c0901 (patch) | |
| tree | 03029d7ed46fc14ffc598b75ac1536faef26a0d1 /include | |
| parent | e39d200fa5bf5b94a0948db0dae44c1b73b84a56 (diff) | |
| parent | 0eb7c33cadf6b2f1a94e58ded8b0eb89b4eba382 (diff) | |
Merge tag 'kvm-arm-fixes-for-v4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM Fixes for v4.15, Round 2
Fixes:
- A bug in our handling of SPE state for non-vhe systems
- A bug that causes hyp unmapping to go off limits and crash the system on
shutdown
- Three timer fixes that were introduced as part of the timer optimizations
for v4.15
Diffstat (limited to 'include')
| -rw-r--r-- | include/kvm/arm_arch_timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index 6e45608b2399..9da6ce22803f 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -62,7 +62,7 @@ struct arch_timer_cpu { bool enabled; }; -int kvm_timer_hyp_init(void); +int kvm_timer_hyp_init(bool); int kvm_timer_enable(struct kvm_vcpu *vcpu); int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu); void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu); |