aboutsummaryrefslogtreecommitdiff
path: root/virt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-02-13 08:36:18 +0100
committerIngo Molnar <mingo@kernel.org>2019-02-13 08:36:18 +0100
commitcae45e1c6c541283a1bd155aa7b0a57e353b4df4 (patch)
treeba87fdd6b47cb2937fc1b6d69ef0595a08646556 /virt
parentaa0c38cf39de73bf7360a3da8f1707601261e518 (diff)
parente7ffb4eb9a6d89678e7f62461737899f88dab64e (diff)
downloadlinux-stericsson-cae45e1c6c541283a1bd155aa7b0a57e353b4df4.tar.gz
Merge branch 'rcu-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull the latest RCU tree from Paul E. McKenney: - Additional cleanups after RCU flavor consolidation - Grace-period forward-progress cleanups and improvements - Documentation updates - Miscellaneous fixes - spin_is_locked() conversions to lockdep - SPDX changes to RCU source and header files - SRCU updates - Torture-test updates, including nolibc updates and moving nolibc to tools/include Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 585845203db8..38df17b7760e 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -4084,7 +4084,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);
}
}