diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-12-28 10:26:48 +0000 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-12-28 10:26:48 +0000 |
| commit | 60dd133a7b77b6adc2d18ff1a85db5a67434a071 (patch) | |
| tree | eb547e3490340335770449ad81d13b9c9f0e5031 /arch/arm/include/asm/kvm_host.h | |
| parent | 989c6b34f6a9480e397b170cc62237e89bf4fdb9 (diff) | |
| parent | fa20f5aea56f271f83e91b9cde00f043a5a14990 (diff) | |
Merge tag 'vgic-migrate-for-marc' of git://git.linaro.org/people/christoffer.dall/linux-kvm-arm into kvm-arm64/next
VGIC and timer migration pull
Diffstat (limited to 'arch/arm/include/asm/kvm_host.h')
| -rw-r--r-- | arch/arm/include/asm/kvm_host.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 8a6f6db14ee4..098f7dd6d564 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -225,4 +225,7 @@ static inline int kvm_arch_dev_ioctl_check_extension(long ext) int kvm_perf_init(void); int kvm_perf_teardown(void); +u64 kvm_arm_timer_get_reg(struct kvm_vcpu *, u64 regid); +int kvm_arm_timer_set_reg(struct kvm_vcpu *, u64 regid, u64 value); + #endif /* __ARM_KVM_HOST_H__ */ |