diff options
Diffstat (limited to 'arch/x86/kvm/lapic.c')
-rw-r--r-- | arch/x86/kvm/lapic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index e904ff06a83d..2a4f278f3b56 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c | |||
@@ -1598,7 +1598,7 @@ static void start_sw_tscdeadline(struct kvm_lapic *apic) | |||
1598 | likely(ns > apic->lapic_timer.timer_advance_ns)) { | 1598 | likely(ns > apic->lapic_timer.timer_advance_ns)) { |
1599 | expire = ktime_add_ns(now, ns); | 1599 | expire = ktime_add_ns(now, ns); |
1600 | expire = ktime_sub_ns(expire, ktimer->timer_advance_ns); | 1600 | expire = ktime_sub_ns(expire, ktimer->timer_advance_ns); |
1601 | hrtimer_start(&ktimer->timer, expire, HRTIMER_MODE_ABS); | 1601 | hrtimer_start(&ktimer->timer, expire, HRTIMER_MODE_ABS_HARD); |
1602 | } else | 1602 | } else |
1603 | apic_timer_expired(apic); | 1603 | apic_timer_expired(apic); |
1604 | 1604 | ||
@@ -2299,7 +2299,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu, int timer_advance_ns) | |||
2299 | apic->vcpu = vcpu; | 2299 | apic->vcpu = vcpu; |
2300 | 2300 | ||
2301 | hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC, | 2301 | hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC, |
2302 | HRTIMER_MODE_ABS); | 2302 | HRTIMER_MODE_ABS_HARD); |
2303 | apic->lapic_timer.timer.function = apic_timer_fn; | 2303 | apic->lapic_timer.timer.function = apic_timer_fn; |
2304 | if (timer_advance_ns == -1) { | 2304 | if (timer_advance_ns == -1) { |
2305 | apic->lapic_timer.timer_advance_ns = LAPIC_TIMER_ADVANCE_ADJUST_INIT; | 2305 | apic->lapic_timer.timer_advance_ns = LAPIC_TIMER_ADVANCE_ADJUST_INIT; |
@@ -2484,7 +2484,7 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu) | |||
2484 | 2484 | ||
2485 | timer = &vcpu->arch.apic->lapic_timer.timer; | 2485 | timer = &vcpu->arch.apic->lapic_timer.timer; |
2486 | if (hrtimer_cancel(timer)) | 2486 | if (hrtimer_cancel(timer)) |
2487 | hrtimer_start_expires(timer, HRTIMER_MODE_ABS); | 2487 | hrtimer_start_expires(timer, HRTIMER_MODE_ABS_HARD); |
2488 | } | 2488 | } |
2489 | 2489 | ||
2490 | /* | 2490 | /* |