aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/i8254.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kvm/i8254.c')
-rw-r--r--arch/x86/kvm/i8254.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index c0f7872a9124..1bf8f57a3041 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -205,8 +205,8 @@ static int __pit_timer_fn(struct kvm_kpit_state *ps)
205 wake_up_interruptible(&vcpu0->wq); 205 wake_up_interruptible(&vcpu0->wq);
206 } 206 }
207 207
208 pt->timer.expires = ktime_add_ns(pt->timer.expires, pt->period); 208 hrtimer_add_expires_ns(&pt->timer, pt->period);
209 pt->scheduled = ktime_to_ns(pt->timer.expires); 209 pt->scheduled = ktime_to_ns(hrtimer_get_expires(&pt->timer));
210 210
211 return (pt->period == 0 ? 0 : 1); 211 return (pt->period == 0 ? 0 : 1);
212} 212}
@@ -246,7 +246,7 @@ void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu)
246 246
247 timer = &pit->pit_state.pit_timer.timer; 247 timer = &pit->pit_state.pit_timer.timer;
248 if (hrtimer_cancel(timer)) 248 if (hrtimer_cancel(timer))
249 hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS); 249 hrtimer_start_expires(timer, HRTIMER_MODE_ABS);
250} 250}
251 251
252static void destroy_pit_timer(struct kvm_kpit_timer *pt) 252static void destroy_pit_timer(struct kvm_kpit_timer *pt)