diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2022-03-04 18:39:29 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-03-04 18:39:29 -0500 |
| commit | 0564eeb71bbb0e1a566fb701f90155bef9e7a224 (patch) | |
| tree | 2935323651d0f8ab2acb5f96f6ee6c722a9cad5a /virt/kvm/kvm_main.c | |
| parent | KVM: SVM: Disable preemption across AVIC load/put during APICv refresh (diff) | |
| parent | KVM: x86: pull kvm->srcu read-side to kvm_arch_vcpu_ioctl_run (diff) | |
| download | linux-dev-0564eeb71bbb0e1a566fb701f90155bef9e7a224.tar.xz linux-dev-0564eeb71bbb0e1a566fb701f90155bef9e7a224.zip | |
Merge branch 'kvm-bugfixes' into HEAD
Merge bugfixes from 5.17 before merging more tricky work.
Diffstat (limited to 'virt/kvm/kvm_main.c')
| -rw-r--r-- | virt/kvm/kvm_main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 64eb99444688..c941b97fa133 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -5522,9 +5522,7 @@ static int kvm_suspend(void) static void kvm_resume(void) { if (kvm_usage_count) { -#ifdef CONFIG_LOCKDEP - WARN_ON(lockdep_is_held(&kvm_count_lock)); -#endif + lockdep_assert_not_held(&kvm_count_lock); hardware_enable_nolock(NULL); } } |