diff options
| author | Colin Cross <ccross@android.com> | 2011-01-10 17:18:52 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-10 17:18:52 -0800 |
| commit | 1fb62ec46a714b133d2b3297264a142154809e6e (patch) | |
| tree | 712d6b6fb93dc715a31115e132735cc9ef877926 /kernel | |
| parent | 5ca2c0f1ccfcbc22a78e0967bf146e29f1a311c1 (diff) | |
| parent | 78d2a8274115727ab3864584abee09d3021de9c6 (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 3f1552c7ee11..cc2a04ed3cc5 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -4177,7 +4177,7 @@ void cgroup_exit(struct task_struct *tsk, int run_callbacks) if (!list_empty(&tsk->cg_list)) { write_lock(&css_set_lock); if (!list_empty(&tsk->cg_list)) - list_del(&tsk->cg_list); + list_del_init(&tsk->cg_list); write_unlock(&css_set_lock); } |