Skip to content

Commit

Permalink
rcu: Remove deprecated rcu_lockdep_assert()
Browse files Browse the repository at this point in the history
The old rcu_lockdep_assert() was retained to ease handling of incoming
patches, but any use will result in deprecated warnings.  However, its
replacement, RCU_LOCKDEP_WARN(), is now upstream.  It is therefore
time to remove rcu_lockdep_assert(), which this commit does.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
  • Loading branch information
Paul E. McKenney committed Oct 6, 2015
1 parent 8db70b1 commit e62e3f6
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions include/linux/rcupdate.h
Original file line number Diff line number Diff line change
Expand Up @@ -537,28 +537,8 @@ static inline int rcu_read_lock_sched_held(void)

#endif /* #else #ifdef CONFIG_DEBUG_LOCK_ALLOC */

/* Deprecate rcu_lockdep_assert(): Use RCU_LOCKDEP_WARN() instead. */
static inline void __attribute((deprecated)) deprecate_rcu_lockdep_assert(void)
{
}

#ifdef CONFIG_PROVE_RCU

/**
* rcu_lockdep_assert - emit lockdep splat if specified condition not met
* @c: condition to check
* @s: informative message
*/
#define rcu_lockdep_assert(c, s) \
do { \
static bool __section(.data.unlikely) __warned; \
deprecate_rcu_lockdep_assert(); \
if (debug_lockdep_rcu_enabled() && !__warned && !(c)) { \
__warned = true; \
lockdep_rcu_suspicious(__FILE__, __LINE__, s); \
} \
} while (0)

/**
* RCU_LOCKDEP_WARN - emit lockdep splat if specified condition is met
* @c: condition to check
Expand Down Expand Up @@ -596,7 +576,6 @@ static inline void rcu_preempt_sleep_check(void)

#else /* #ifdef CONFIG_PROVE_RCU */

#define rcu_lockdep_assert(c, s) deprecate_rcu_lockdep_assert()
#define RCU_LOCKDEP_WARN(c, s) do { } while (0)
#define rcu_sleep_check() do { } while (0)

Expand Down

0 comments on commit e62e3f6

Please sign in to comment.