diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-07-13 14:15:40 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-08-10 16:24:01 -0400 |
| commit | 88948c4079f78a8ce1a65659ffaa3f61bfa310a7 (patch) | |
| tree | 9aca89459b167158d9f25f3230ea437a1e931153 /crypto/ablkcipher.c | |
| parent | 6528d54b4cde3a059164609030bfc23606fbf37d (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>
Diffstat (limited to 'crypto/ablkcipher.c')
0 files changed, 0 insertions, 0 deletions