diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2008-12-30 15:55:05 -0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-02-15 02:47:36 +0200 |
| commit | d2a8284e8fca9e2a938bee6cd074064d23864886 (patch) | |
| tree | 07e06742a3ac5431c5994a1227ef177eea20ad01 /arch | |
| parent | ba4cef31d5a397b64ba6d3ff713ce06c62f0c597 (diff) | |
| download | kernel-crypto-d2a8284e8fca9e2a938bee6cd074064d23864886.tar.gz kernel-crypto-d2a8284e8fca9e2a938bee6cd074064d23864886.tar.xz kernel-crypto-d2a8284e8fca9e2a938bee6cd074064d23864886.zip | |
KVM: PIT: fix i8254 pending count read
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>
Diffstat (limited to 'arch')
| -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 e665d1c623c..72bd275a9b5 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); } |