Merge branch 'pm-opp'

[mirror_ubuntu-bionic-kernel.git] / drivers / base / power / opp.c

diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index 4eff4cd7eb546ba46f177d90846178ebd04c69a6..28cd75c535b047f2c4276fed4308fa8159491007 100644 (file)
--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -148,8 +148,8 @@ static DEFINE_MUTEX(dev_opp_list_lock);
 
 #define opp_rcu_lockdep_assert()                                       \
 do {                                                                   \
-       rcu_lockdep_assert(rcu_read_lock_held() ||                      \
-                               lockdep_is_held(&dev_opp_list_lock),    \
+       RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&                       \
+                               !lockdep_is_held(&dev_opp_list_lock),   \
                           "Missing rcu_read_lock() or "                \
                           "dev_opp_list_lock protection");             \
 } while (0)