diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-21 10:48:31 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-21 10:48:31 +0300 |
| commit | 03e3e31ee5c8d45c62c31035578bab5e90133eff (patch) | |
| tree | 5cff3fda5bb8278621c27823f52b7e8dd85fb0ef /arch/x86/kvm/lapic.c | |
| parent | 3ce3e45cc333da707d4d6eb433574b990bcc26f5 (diff) | |
| parent | 50f09a3dd5877bda888fc25c3d98937dcfb85539 (diff) | |
| download | linux-03e3e31ee5c8d45c62c31035578bab5e90133eff.tar.xz | |
Merge 50f09a3dd587 ("Merge tag 'char-misc-5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into char-misc-next
We want the char/misc driver fixes in here as well
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kvm/lapic.c')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 152591f9243a..c0ebef560bd1 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1913,8 +1913,8 @@ void kvm_lapic_expired_hv_timer(struct kvm_vcpu *vcpu) if (!apic->lapic_timer.hv_timer_in_use) goto out; WARN_ON(rcuwait_active(&vcpu->wait)); - cancel_hv_timer(apic); apic_timer_expired(apic, false); + cancel_hv_timer(apic); if (apic_lvtt_period(apic) && apic->lapic_timer.period) { advance_periodic_target_expiration(apic); |