X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=drivers%2Fbase%2Fpower%2Fopp.c;h=28cd75c535b047f2c4276fed4308fa8159491007;hb=7c976664d537bca19c9bf892b4d9e5ab7ecea927;hp=4eff4cd7eb546ba46f177d90846178ebd04c69a6;hpb=1b2b90cbea00670221f062814dc8bcecb3af7b90;p=mirror_ubuntu-bionic-kernel.git

diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index 4eff4cd7eb54..28cd75c535b0 100644
--- 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)