git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
include
/
linux
/
cgroup.h
diff --git
a/include/linux/cgroup.h
b/include/linux/cgroup.h
index
b8ad1ea
..
8f78073
100644
(file)
--- a/
include/linux/cgroup.h
+++ b/
include/linux/cgroup.h
@@
-530,6
+530,7
@@
static inline struct cgroup_subsys_state *task_subsys_state(
{
return rcu_dereference_check(task->cgroups->subsys[subsys_id],
rcu_read_lock_held() ||
+ lockdep_is_held(&task->alloc_lock) ||
cgroup_lock_is_held());
}