Unverified Commit 3f2841fc authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9719 KVM: LAPIC: Also cancel preemption timer during SET_LAPIC 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3YVNMWS6PU7XNBFHOGTMG2EIPC47XI2I/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA72K9 
 
Link:https://gitee.com/openeuler/kernel/pulls/9719

 

Reviewed-by: default avatarZenghui Yu <yuzenghui@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 8403302d 901b3634

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -2631,7 +2631,7 @@ int kvm_apic_set_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s) 
	kvm_apic_set_version(vcpu);



	apic_update_ppr(apic);

	hrtimer_cancel(&apic->lapic_timer.timer);

	cancel_apic_timer(apic);

	apic_update_lvtt(apic);

	apic_manage_nmi_watchdog(apic, kvm_lapic_get_reg(apic, APIC_LVT0));

	update_divide_count(apic);