diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-07-13 14:15:40 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-07-13 14:15:40 -0400 |
| commit | e9bad25e90fc586a2d2c35154ba5641b3d8e2346 (patch) | |
| tree | 5c9adea2c36d4ccba787f9c52b7072afc37d0d62 | |
| parent | 58c5eeb7c93b5b7b47e98b7575b9862abc7e1414 (diff) | |
cgroup: Fixup mismergetracking-linaro-android-3.5-llct-20120726.0tracking-linaro-android-3.5-llct-20120725.0tracking-linaro-android-3.5-llct-20120723.1tracking-linaro-android-3.5-llct-20120723.0tracking-linaro-android-3.5-llct-20120716.1tracking-linaro-android-3.5-llct-20120716.0tracking-linaro-android-3.5-llct-20120713.0
Tixy noticed:
I'm using linaro-android-3.5-jstultz-rebase and notice that this patch:
http://git.linaro.org/gitweb?p=people/jstultz/android.git;a=commit;h=ea41cae1ff4a919082afe28fbe9ae0e7b00af8d
doesn't delete a chunk in put_css_set that was deleted in the
upstream/android-3.4 tree:
http://git.linaro.org/gitweb?p=people/jstultz/android.git;a=commit;h=befae2f2c9137d6af5c8b38670f00441019032bb
The erroneous chunk seems to come from mainline Linux code and deleting
it gets things compiling again (see patch at bottom of email). I don't
know how to test the affected code as it doesn't seem to get executed
just by enabling cgroups and booting Android.
BTW, I enabled cgroups because the prototype scheduler code for
Asymmetric Multi Processing depends on it, but I have no idea about how
it's going to be used.
This patch resolves the mismerge by deteling the chunk in question.
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | kernel/cgroup.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 067a0824ce4..9fdea8437fa 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -472,21 +472,6 @@ static void __put_css_set(struct css_set *cg, int taskexit) hlist_del(&cg->hlist); css_set_count--; - list_for_each_entry_safe(link, saved_link, &cg->cg_links, - cg_link_list) { - struct cgroup *cgrp = link->cgrp; - list_del(&link->cg_link_list); - list_del(&link->cgrp_link_list); - if (atomic_dec_and_test(&cgrp->count) && - notify_on_release(cgrp)) { - if (taskexit) - set_bit(CGRP_RELEASABLE, &cgrp->flags); - check_for_release(cgrp); - } - - kfree(link); - } - write_unlock(&css_set_lock); call_rcu(&cg->rcu_head, free_css_set_rcu); } |