diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-06-18 18:50:02 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-07-22 18:27:32 -0400 |
commit | f78f5b90c4ffa559e400c3919a02236101f29f3f (patch) | |
tree | ded8a53b5c2bc06ab532d4b9a2e6e99a12912574 /kernel/rcu/tiny.c | |
parent | 46f00d18fca42cc954c2e9e99a48b6f3a7741ed7 (diff) |
rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()
This commit renames rcu_lockdep_assert() to RCU_LOCKDEP_WARN() for
consistency with the WARN() series of macros. This also requires
inverting the sense of the conditional, which this commit also does.
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/rcu/tiny.c')
-rw-r--r-- | kernel/rcu/tiny.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c index c291bd65d2cb..d0471056d0af 100644 --- a/kernel/rcu/tiny.c +++ b/kernel/rcu/tiny.c | |||
@@ -191,10 +191,10 @@ static void rcu_process_callbacks(struct softirq_action *unused) | |||
191 | */ | 191 | */ |
192 | void synchronize_sched(void) | 192 | void synchronize_sched(void) |
193 | { | 193 | { |
194 | rcu_lockdep_assert(!lock_is_held(&rcu_bh_lock_map) && | 194 | RCU_LOCKDEP_WARN(lock_is_held(&rcu_bh_lock_map) || |
195 | !lock_is_held(&rcu_lock_map) && | 195 | lock_is_held(&rcu_lock_map) || |
196 | !lock_is_held(&rcu_sched_lock_map), | 196 | lock_is_held(&rcu_sched_lock_map), |
197 | "Illegal synchronize_sched() in RCU read-side critical section"); | 197 | "Illegal synchronize_sched() in RCU read-side critical section"); |
198 | cond_resched(); | 198 | cond_resched(); |
199 | } | 199 | } |
200 | EXPORT_SYMBOL_GPL(synchronize_sched); | 200 | EXPORT_SYMBOL_GPL(synchronize_sched); |