diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-01 14:55:57 -0700 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-05 21:35:07 -0700 |
| commit | beb20d52d03a51218827fb4a36a4b583debb03f9 (patch) | |
| tree | f4071d0bd3464576b07177e8d91d4d5f1e5accce /arch/x86/kvm/lapic.c | |
| parent | 63ca243b271f5b44e0b1057003cf498b6d0fadf7 (diff) | |
| download | linux-stable-beb20d52d03a51218827fb4a36a4b583debb03f9.tar.gz linux-stable-beb20d52d03a51218827fb4a36a4b583debb03f9.tar.bz2 linux-stable-beb20d52d03a51218827fb4a36a4b583debb03f9.zip | |
hrtimer: convert kvm to the new hrtimer apis
In order to be able to do range hrtimers we need to use accessor functions
to the "expire" member of the hrtimer struct.
This patch converts KVM to these accessors.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'arch/x86/kvm/lapic.c')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 73f43de69f67..a5b61de6adf1 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -953,9 +953,7 @@ static int __apic_timer_fn(struct kvm_lapic *apic) } if (apic_lvtt_period(apic)) { result = 1; - apic->timer.dev.expires = ktime_add_ns( - apic->timer.dev.expires, - apic->timer.period); + hrtimer_add_expires_ns(&apic->timer.dev, apic->timer.period); } return result; } @@ -1124,7 +1122,7 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu) timer = &apic->timer.dev; if (hrtimer_cancel(timer)) - hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS); + hrtimer_start_expires(timer, HRTIMER_MODE_ABS); } void kvm_lapic_sync_from_vapic(struct kvm_vcpu *vcpu) |