diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2009-03-23 17:51:35 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-02 10:57:11 -0700 |
| commit | fcae516675463fce5123d5dc0c861ad9dd283ffe (patch) | |
| tree | fee361a89d064d5bd600d1167e62b8d44013b054 | |
| parent | 2aa2267cc3836db2680d99e1c5da08af6a7243bd (diff) | |
KVM: PIT: fix i8254 pending count read
(cherry picked from d2a8284e8fca9e2a938bee6cd074064d23864886)
count_load_time assignment is bogus: its supposed to contain what it
means, not the expiration time.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | arch/x86/kvm/i8254.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index 59ebd37ad79e..3a104144a454 100644 --- a/arch/x86/kvm/i8254.c +++ b/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); } |