diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-08 10:55:03 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-16 12:30:25 -0300 |
| commit | ace1546487a0fe4634e3251067f8a32cb2cdc099 (patch) | |
| tree | 6f7ac8a23d0ac1ae5af287916cdd356de114f877 /arch/x86/kvm/i8254.c | |
| parent | 012abeea669ea49636cf952d13298bb68654146a (diff) | |
| download | kernel_goldelico_gta04-ace1546487a0fe4634e3251067f8a32cb2cdc099.zip kernel_goldelico_gta04-ace1546487a0fe4634e3251067f8a32cb2cdc099.tar.gz kernel_goldelico_gta04-ace1546487a0fe4634e3251067f8a32cb2cdc099.tar.bz2 | |
KVM: use proper hrtimer function to retrieve expiration time
hrtimer->base can be temporarily NULL due to racing hrtimer_start.
See switch_hrtimer_base/lock_hrtimer_base.
Use hrtimer_get_remaining which is robust against it.
CC: stable@kernel.org
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/i8254.c')
| -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 82ad523..144e7f6 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c @@ -116,7 +116,7 @@ static s64 __kpit_elapsed(struct kvm *kvm) * itself with the initial count and continues counting * from there. */ - remaining = hrtimer_expires_remaining(&ps->pit_timer.timer); + remaining = hrtimer_get_remaining(&ps->pit_timer.timer); elapsed = ps->pit_timer.period - ktime_to_ns(remaining); elapsed = mod_64(elapsed, ps->pit_timer.period); |