summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2022-03-04 18:39:29 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2022-03-04 18:39:29 -0500
commit0564eeb71bbb0e1a566fb701f90155bef9e7a224 (patch)
tree2935323651d0f8ab2acb5f96f6ee6c722a9cad5a /virt
parentb652de1e3dfb3b49e539e88a684a68e333e1bd7c (diff)
parent8d25b7beca7ed6ca34f53f0f8abd009e2be15d94 (diff)
downloadlinux-0564eeb71bbb0e1a566fb701f90155bef9e7a224.tar.bz2
Merge branch 'kvm-bugfixes' into HEAD
Merge bugfixes from 5.17 before merging more tricky work.
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c4
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);
}
}