Merge tag 'kvm-s390-master-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-zesty-kernel.git] / include / kvm / arm_arch_timer.h

diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h
index dda39d8fa189b50d897c7c59bbba5b1f8bdab649..5c970ce6794977a73e8c69181b5fe715191927b5 100644 (file)
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
@@ -25,13 +25,13 @@
 
 struct arch_timer_kvm {
        /* Virtual offset */
-       cycle_t                 cntvoff;
+       u64                     cntvoff;
 };
 
 struct arch_timer_cpu {
        /* Registers: control register, timer value */
        u32                             cntv_ctl;       /* Saved/restored */
-       cycle_t                         cntv_cval;      /* Saved/restored */
+       u64                             cntv_cval;      /* Saved/restored */
 
        /*
         * Anything that is not used directly from assembly code goes
@@ -76,4 +76,5 @@ void kvm_timer_unschedule(struct kvm_vcpu *vcpu);
 
 void kvm_timer_vcpu_put(struct kvm_vcpu *vcpu);
 
+void kvm_timer_init_vhe(void);
 #endif