rcu_sync: Cleanup the CONFIG_PROVE_RCU checks

[mirror_ubuntu-zesty-kernel.git] / kernel / rcu / sync.c

diff --git a/kernel/rcu/sync.c b/kernel/rcu/sync.c
index 1e353f0a2b66aee9832f37c0a777d9b5dd8220dc..be922c9f3d37256fc060d5b9ba0aaf6a2d1f085c 100644 (file)
--- a/kernel/rcu/sync.c
+++ b/kernel/rcu/sync.c
@@ -63,10 +63,10 @@ enum { CB_IDLE = 0, CB_PENDING, CB_REPLAY };
 #define        rss_lock        gp_wait.lock
 
 #ifdef CONFIG_PROVE_RCU
-bool __rcu_sync_is_idle(struct rcu_sync *rsp)
+void rcu_sync_lockdep_assert(struct rcu_sync *rsp)
 {
-       WARN_ON(!gp_ops[rsp->gp_type].held());
-       return rsp->gp_state == GP_IDLE;
+       RCU_LOCKDEP_WARN(!gp_ops[rsp->gp_type].held(),
+                        "suspicious rcu_sync_is_idle() usage");
 }
 #endif