From 51fce20a48858bca75c842270e1f6a8d81d0bad2 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Tue, 30 Dec 2008 15:55:05 -0200 Subject: [PATCH] --- yaml --- r: 131369 b: refs/heads/master c: d2a8284e8fca9e2a938bee6cd074064d23864886 h: refs/heads/master i: 131367: fbf78e67e719ab565b2321cdcc51db4cb9eac9a9 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/i8254.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 57f30bf755e1..78893606a5de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba4cef31d5a397b64ba6d3ff713ce06c62f0c597 +refs/heads/master: d2a8284e8fca9e2a938bee6cd074064d23864886 diff --git a/trunk/arch/x86/kvm/i8254.c b/trunk/arch/x86/kvm/i8254.c index e665d1c623ca..72bd275a9b5c 100644 --- a/trunk/arch/x86/kvm/i8254.c +++ b/trunk/arch/x86/kvm/i8254.c @@ -207,7 +207,7 @@ static int __pit_timer_fn(struct kvm_kpit_state *ps) hrtimer_add_expires_ns(&pt->timer, pt->period); pt->scheduled = hrtimer_get_expires_ns(&pt->timer); if (pt->period) - ps->channels[0].count_load_time = hrtimer_get_expires(&pt->timer); + ps->channels[0].count_load_time = ktime_get(); return (pt->period == 0 ? 0 : 1); }