diff options
Diffstat (limited to 'include/kvm')
| -rw-r--r-- | include/kvm/arm_arch_timer.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index ad9db6045b2f..b3f45a578344 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h | |||
| @@ -60,7 +60,8 @@ struct arch_timer_cpu { | |||
| 60 | 60 | ||
| 61 | #ifdef CONFIG_KVM_ARM_TIMER | 61 | #ifdef CONFIG_KVM_ARM_TIMER |
| 62 | int kvm_timer_hyp_init(void); | 62 | int kvm_timer_hyp_init(void); |
| 63 | int kvm_timer_init(struct kvm *kvm); | 63 | void kvm_timer_enable(struct kvm *kvm); |
| 64 | void kvm_timer_init(struct kvm *kvm); | ||
| 64 | void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, | 65 | void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, |
| 65 | const struct kvm_irq_level *irq); | 66 | const struct kvm_irq_level *irq); |
| 66 | void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu); | 67 | void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu); |
| @@ -77,11 +78,8 @@ static inline int kvm_timer_hyp_init(void) | |||
| 77 | return 0; | 78 | return 0; |
| 78 | }; | 79 | }; |
| 79 | 80 | ||
| 80 | static inline int kvm_timer_init(struct kvm *kvm) | 81 | static inline void kvm_timer_enable(struct kvm *kvm) {} |
| 81 | { | 82 | static inline void kvm_timer_init(struct kvm *kvm) {} |
| 82 | return 0; | ||
| 83 | } | ||
| 84 | |||
| 85 | static inline void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, | 83 | static inline void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, |
| 86 | const struct kvm_irq_level *irq) {} | 84 | const struct kvm_irq_level *irq) {} |
| 87 | static inline void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) {} | 85 | static inline void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) {} |
