diff options
Diffstat (limited to 'virt/kvm/arm/arch_timer.c')
-rw-r--r-- | virt/kvm/arm/arch_timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index ae95fc0e3214..97b657adb3bd 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c | |||
@@ -39,7 +39,7 @@ void kvm_timer_vcpu_put(struct kvm_vcpu *vcpu) | |||
39 | vcpu->arch.timer_cpu.active_cleared_last = false; | 39 | vcpu->arch.timer_cpu.active_cleared_last = false; |
40 | } | 40 | } |
41 | 41 | ||
42 | static cycle_t kvm_phys_timer_read(void) | 42 | static u64 kvm_phys_timer_read(void) |
43 | { | 43 | { |
44 | return timecounter->cc->read(timecounter->cc); | 44 | return timecounter->cc->read(timecounter->cc); |
45 | } | 45 | } |
@@ -102,7 +102,7 @@ static void kvm_timer_inject_irq_work(struct work_struct *work) | |||
102 | 102 | ||
103 | static u64 kvm_timer_compute_delta(struct kvm_vcpu *vcpu) | 103 | static u64 kvm_timer_compute_delta(struct kvm_vcpu *vcpu) |
104 | { | 104 | { |
105 | cycle_t cval, now; | 105 | u64 cval, now; |
106 | 106 | ||
107 | cval = vcpu->arch.timer_cpu.cntv_cval; | 107 | cval = vcpu->arch.timer_cpu.cntv_cval; |
108 | now = kvm_phys_timer_read() - vcpu->kvm->arch.timer.cntvoff; | 108 | now = kvm_phys_timer_read() - vcpu->kvm->arch.timer.cntvoff; |
@@ -155,7 +155,7 @@ static bool kvm_timer_irq_can_fire(struct kvm_vcpu *vcpu) | |||
155 | bool kvm_timer_should_fire(struct kvm_vcpu *vcpu) | 155 | bool kvm_timer_should_fire(struct kvm_vcpu *vcpu) |
156 | { | 156 | { |
157 | struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; | 157 | struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; |
158 | cycle_t cval, now; | 158 | u64 cval, now; |
159 | 159 | ||
160 | if (!kvm_timer_irq_can_fire(vcpu)) | 160 | if (!kvm_timer_irq_can_fire(vcpu)) |
161 | return false; | 161 | return false; |