diff options
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) | |||
953 | } | 953 | } |
954 | if (apic_lvtt_period(apic)) { | 954 | if (apic_lvtt_period(apic)) { |
955 | result = 1; | 955 | result = 1; |
956 | apic->timer.dev.expires = ktime_add_ns( | 956 | hrtimer_add_expires_ns(&apic->timer.dev, apic->timer.period); |
957 | apic->timer.dev.expires, | ||
958 | apic->timer.period); | ||
959 | } | 957 | } |
960 | return result; | 958 | return result; |
961 | } | 959 | } |
@@ -1124,7 +1122,7 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu) | |||
1124 | 1122 | ||
1125 | timer = &apic->timer.dev; | 1123 | timer = &apic->timer.dev; |
1126 | if (hrtimer_cancel(timer)) | 1124 | if (hrtimer_cancel(timer)) |
1127 | hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS); | 1125 | hrtimer_start_expires(timer, HRTIMER_MODE_ABS); |
1128 | } | 1126 | } |
1129 | 1127 | ||
1130 | void kvm_lapic_sync_from_vapic(struct kvm_vcpu *vcpu) | 1128 | void kvm_lapic_sync_from_vapic(struct kvm_vcpu *vcpu) |