diff options
| author | Paul E. McKenney <[email protected]> | 2019-01-08 18:39:49 +0000 |
|---|---|---|
| committer | Paul E. McKenney <[email protected]> | 2019-01-25 23:36:05 +0000 |
| commit | 6706dae90d85d394d0134d0ec516c25560b9ce77 (patch) | |
| tree | 9f3f10eb1cb61d51ca5a8c1c7fb1d8b3b5cd487b | |
| parent | include/asm-generic: Remove spin_is_locked() comment (diff) | |
| download | kernel-6706dae90d85d394d0134d0ec516c25560b9ce77.tar.gz kernel-6706dae90d85d394d0134d0ec516c25560b9ce77.zip | |
virt/kvm: Replace spin_is_locked() with lockdep
lockdep_assert_held() is better suited to checking locking requirements,
since it only checks if the current thread holds the lock regardless of
whether someone else does. This is also a step towards possibly removing
spin_is_locked().
Signed-off-by: Paul E. McKenney <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: "Radim Krčmář" <[email protected]>
Cc: <[email protected]>
Acked-by: Paolo Bonzini <[email protected]>
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 5ecea812cb6a..28de87ff9f51 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4083,7 +4083,7 @@ static int kvm_suspend(void) static void kvm_resume(void) { if (kvm_usage_count) { - WARN_ON(raw_spin_is_locked(&kvm_count_lock)); + lockdep_assert_held(&kvm_count_lock); hardware_enable_nolock(NULL); } } |