diff options
author | Alex Bennée <alex.bennee@linaro.org> | 2014-07-04 10:54:14 -0400 |
---|---|---|
committer | Christoffer Dall <christoffer.dall@linaro.org> | 2014-07-11 07:46:55 -0400 |
commit | 1df08ba0aa95f1a8832b7162eec51069bd9be7ae (patch) | |
tree | 17d48cbca3717b162f311bc00d4a6d4c003c432d /arch/arm/kvm | |
parent | efd48ceacea78e4d4656aa0a6bf4c5b92ed22130 (diff) |
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/kvm')
-rw-r--r-- | arch/arm/kvm/guest.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c index b23a59c1c522..986e625b5dbd 100644 --- a/arch/arm/kvm/guest.c +++ b/arch/arm/kvm/guest.c | |||
@@ -124,16 +124,6 @@ static bool is_timer_reg(u64 index) | |||
124 | return false; | 124 | return false; |
125 | } | 125 | } |
126 | 126 | ||
127 | int kvm_arm_timer_set_reg(struct kvm_vcpu *vcpu, u64 regid, u64 value) | ||
128 | { | ||
129 | return 0; | ||
130 | } | ||
131 | |||
132 | u64 kvm_arm_timer_get_reg(struct kvm_vcpu *vcpu, u64 regid) | ||
133 | { | ||
134 | return 0; | ||
135 | } | ||
136 | |||
137 | #else | 127 | #else |
138 | 128 | ||
139 | #define NUM_TIMER_REGS 3 | 129 | #define NUM_TIMER_REGS 3 |