diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-12-05 18:02:03 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-12-05 18:02:03 +0100 |
| commit | 609b7002705ae72a6ca45b633b7ff1a09a7a0d86 (patch) | |
| tree | 515db242be433c34cd45c522dcf295580f864837 /include | |
| parent | ae64f9bd1d3621b5e60d7363bc20afb46aede215 (diff) | |
| parent | fc396e066318c0a02208c1d3f0b62950a7714999 (diff) | |
| download | linux-609b7002705ae72a6ca45b633b7ff1a09a7a0d86.tar.gz linux-609b7002705ae72a6ca45b633b7ff1a09a7a0d86.tar.bz2 linux-609b7002705ae72a6ca45b633b7ff1a09a7a0d86.zip | |
Merge tag 'kvm-arm-fixes-for-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM Fixes for v4.15.
Fixes:
- A number of issues in the vgic discovered using SMATCH
- A bit one-off calculation in out stage base address mask (32-bit and
64-bit)
- Fixes to single-step debugging instructions that trap for other
reasons such as MMMIO aborts
- Printing unavailable hyp mode as error
- Potential spinlock deadlock in the vgic
- Avoid calling vgic vcpu free more than once
- Broken bit calculation for big endian systems
Diffstat (limited to 'include')
| -rw-r--r-- | include/kvm/arm_arch_timer.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index 01ee473517e2..6e45608b2399 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -93,7 +93,4 @@ void kvm_timer_init_vhe(void); #define vcpu_vtimer(v) (&(v)->arch.timer_cpu.vtimer) #define vcpu_ptimer(v) (&(v)->arch.timer_cpu.ptimer) -void enable_el1_phys_timer_access(void); -void disable_el1_phys_timer_access(void); - #endif |