| commit | e9bad25e90fc586a2d2c35154ba5641b3d8e2346 | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Fri Jul 13 14:15:40 2012 -0400 |
| committer | John Stultz <john.stultz@linaro.org> | Fri Jul 13 14:15:40 2012 -0400 |
| tree | 5c9adea2c36d4ccba787f9c52b7072afc37d0d62 | |
| parent | 58c5eeb7c93b5b7b47e98b7575b9862abc7e1414 [diff] |
cgroup: Fixup mismerge 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>