---

yaml --- r: 131369 b: refs/heads/master c: d2a8284 h: refs/heads/master i: 131367: fbf78e6 v: v3
git-mirror · Feb 15, 2009 · 51fce20 · 51fce20
1 parent 4e783bf
commit 51fce20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
 }