diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-11-08 15:28:34 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-11-08 15:28:34 +0100 |
| commit | f0d438e4fb35244efc035a0c55ef876cc75a0abb (patch) | |
| tree | 4044e4f4c0908ac9ad916f535044a398c106bbd7 /arch/arm/include/asm/kvm_asm.h | |
| parent | 6d6ab940dc8b1c84fc86195c0f15a82ef282c8a3 (diff) | |
| parent | a2b83133339067c1b27f902e32506ab2871e2320 (diff) | |
| download | linux-f0d438e4fb35244efc035a0c55ef876cc75a0abb.tar.bz2 | |
Merge tag 'kvm-arm-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into next
KVM/ARM Changes for v4.15
Changes include:
- Optimized arch timer handling for KVM/ARM
- Improvements to the VGIC ITS code and introduction of an ITS reset
ioctl
- Unification of the 32-bit fault injection logic
- More exact external abort matching logic
Diffstat (limited to 'arch/arm/include/asm/kvm_asm.h')
| -rw-r--r-- | arch/arm/include/asm/kvm_asm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/kvm_asm.h b/arch/arm/include/asm/kvm_asm.h index 14d68a4d826f..36dd2962a42d 100644 --- a/arch/arm/include/asm/kvm_asm.h +++ b/arch/arm/include/asm/kvm_asm.h @@ -68,6 +68,8 @@ extern void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa); extern void __kvm_tlb_flush_vmid(struct kvm *kvm); extern void __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu); +extern void __kvm_timer_set_cntvoff(u32 cntvoff_low, u32 cntvoff_high); + extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu); extern void __init_stage2_translation(void); |