projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-cpufreq'
[cascardo/linux.git]
/
kernel
/
cgroup.c
diff --git
a/kernel/cgroup.c
b/kernel/cgroup.c
index
f89d929
..
b89f316
100644
(file)
--- 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() \
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");
/*
"cgroup_mutex or RCU read lock required");
/*