diff options
| author | Colin Cross <ccross@android.com> | 2010-12-17 17:23:38 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-12-17 17:23:38 -0800 |
| commit | 8ab30a059d66645d6ddf69f18a7342d761f3c0b9 (patch) | |
| tree | e1ab52a4dd678b3e2cff503a44d7b89f32076164 /include | |
| parent | 2401c286cae84b2265e21fd69cf0f9a62c39f38c (diff) | |
| parent | 05946a1e0fdb011ac0e6638ee60b181c584f127b (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cgroup.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 0c991023ee47..ae9613be93fd 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -84,12 +84,6 @@ enum { CSS_REMOVED, /* This CSS is dead */ }; -/* Caller must verify that the css is not for root cgroup */ -static inline void __css_get(struct cgroup_subsys_state *css, int count) -{ - atomic_add(count, &css->refcnt); -} - /* * Call css_get() to hold a reference on the css; it can be used * for a reference obtained via: @@ -97,6 +91,7 @@ static inline void __css_get(struct cgroup_subsys_state *css, int count) * - task->cgroups for a locked task */ +extern void __css_get(struct cgroup_subsys_state *css, int count); static inline void css_get(struct cgroup_subsys_state *css) { /* We don't need to reference count the root state */ @@ -143,10 +138,7 @@ static inline void css_put(struct cgroup_subsys_state *css) enum { /* Control Group is dead */ CGRP_REMOVED, - /* - * Control Group has previously had a child cgroup or a task, - * but no longer (only if CGRP_NOTIFY_ON_RELEASE is set) - */ + /* Control Group has ever had a child cgroup or a task */ CGRP_RELEASABLE, /* Control Group requires release notifications to userspace */ CGRP_NOTIFY_ON_RELEASE, @@ -283,6 +275,7 @@ struct css_set { /* For RCU-protected deletion */ struct rcu_head rcu_head; + struct work_struct work; }; /* |