am 984bd832: resolved conflicts for 5caca3dd to mnc-dr-dev-plus-aosp

* commit '984bd8323dcb5e494a04b2058ab7de40bf347ee5':
  add system-background cpuset
This commit is contained in:
Tom Cherry 2015-09-21 21:41:46 +00:00 committed by Android Git Automerger
commit 3c6ffbc6fe
6 changed files with 12 additions and 0 deletions

View File

@ -1,2 +1,3 @@
service debuggerd /system/bin/debuggerd
class main
writepid /dev/cpuset/system-background/tasks

View File

@ -1,2 +1,3 @@
service debuggerd64 /system/bin/debuggerd64
class main
writepid /dev/cpuset/system-background/tasks

View File

@ -2,3 +2,4 @@ service lmkd /system/bin/lmkd
class core
critical
socket lmkd seqpacket 0660 system system
writepid /dev/cpuset/system-background/tasks

View File

@ -11,3 +11,4 @@ service logcatd /system/bin/logcat -b all -v threadtime -v usec -v printable -D
# logd for write to /data/misc/logd, log group for read from log daemon
user logd
group log
writepid /dev/cpuset/system-background/tasks

View File

@ -4,7 +4,9 @@ service logd /system/bin/logd
socket logdr seqpacket 0666 logd logd
socket logdw dgram 0222 logd logd
group root system
writepid /dev/cpuset/system-background/tasks
service logd-reinit /system/bin/logd --reinit
oneshot
disabled
writepid /dev/cpuset/system-background/tasks

View File

@ -138,14 +138,20 @@ on init
mkdir /dev/cpuset/foreground
mkdir /dev/cpuset/foreground/boost
mkdir /dev/cpuset/background
# system-background is for system tasks that should only run on
# little cores, not on bigs
# to be used only by init, so don't change the permissions
mkdir /dev/cpuset/system-background
# this ensures that the cpusets are present and usable, but the device's
# init.rc must actually set the correct cpus
write /dev/cpuset/foreground/cpus 0
write /dev/cpuset/foreground/boost/cpus 0
write /dev/cpuset/background/cpus 0
write /dev/cpuset/system-background/cpus 0
write /dev/cpuset/foreground/mems 0
write /dev/cpuset/foreground/boost/mems 0
write /dev/cpuset/background/mems 0
write /dev/cpuset/system-background/mems 0
chown system system /dev/cpuset
chown system system /dev/cpuset/foreground
chown system system /dev/cpuset/foreground/boost