diff options
| author |   Alex Bennée <alex.bennee@linaro.org> | 2014-07-04 15:54:14 +0100 |
|---|---|---|
| committer |   Christoffer Dall <christoffer.dall@linaro.org> | 2014-07-11 04:46:55 -0700 |
| commit | 1df08ba0aa95f1a8832b7162eec51069bd9be7ae (patch) | |
| tree | 17d48cbca3717b162f311bc00d4a6d4c003c432d /arch/arm/include/asm/kvm_host.h | |
| parent | arm64: KVM: export demux regids as KVM_REG_ARM64 (diff) | |
| download | linux-dev-1df08ba0aa95f1a8832b7162eec51069bd9be7ae.tar.xz linux-dev-1df08ba0aa95f1a8832b7162eec51069bd9be7ae.zip | |
arm64: KVM: allow export and import of generic timer regs
For correct guest suspend/resume behaviour we need to ensure we include
the generic timer registers for 64 bit guests. As CONFIG_KVM_ARM_TIMER is
always set for arm64 we don't need to worry about null implementations.
However I have re-jigged the kvm_arm_timer_set/get_reg declarations to
be in the common include/kvm/arm_arch_timer.h headers.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm/include/asm/kvm_host.h')
| -rw-r--r-- | arch/arm/include/asm/kvm_host.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 193ceaf01bfd..dc4e3edf39cc 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -228,7 +228,4 @@ 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__ */ |