diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-06-18 15:50:02 -0700 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-07-22 15:27:32 -0700 |
commit | f78f5b90c4ffa559e400c3919a02236101f29f3f (patch) | |
tree | ded8a53b5c2bc06ab532d4b9a2e6e99a12912574 /kernel/cgroup.c | |
parent | 46f00d18fca42cc954c2e9e99a48b6f3a7741ed7 (diff) | |
download | linux-f78f5b90c4ffa559e400c3919a02236101f29f3f.tar.gz linux-f78f5b90c4ffa559e400c3919a02236101f29f3f.tar.bz2 linux-f78f5b90c4ffa559e400c3919a02236101f29f3f.zip |
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/cgroup.c')
-rw-r--r-- | kernel/cgroup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index f89d9292eee6..b89f3168411b 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -107,8 +107,8 @@ static DEFINE_SPINLOCK(release_agent_path_lock); struct percpu_rw_semaphore cgroup_threadgroup_rwsem; #define cgroup_assert_mutex_or_rcu_locked() \ - rcu_lockdep_assert(rcu_read_lock_held() || \ - lockdep_is_held(&cgroup_mutex), \ + RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \ + !lockdep_is_held(&cgroup_mutex), \ "cgroup_mutex or RCU read lock required"); /* |