diff options
| author | Todd Kjos <tkjos@google.com> | 2015-11-18 08:31:03 -0800 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2015-11-18 08:31:03 -0800 |
| commit | 88b5892d74978df60585ce59dd283d188fecdafa (patch) | |
| tree | 9be0a32e2861a358ecb0060827b773a5f524d7e7 /rootdir | |
| parent | 5153be7f94046cf2e7e34060f9d5ae4866abb015 (diff) | |
| parent | ed60788968be61f4f6f47890e5f3cb182a6a2b6e (diff) | |
| download | core-88b5892d74978df60585ce59dd283d188fecdafa.tar.gz core-88b5892d74978df60585ce59dd283d188fecdafa.tar.bz2 core-88b5892d74978df60585ce59dd283d188fecdafa.zip | |
resolve merge conflicts of ed60788968 to mnc-dr2-dev-plus-aosp.
Change-Id: I9b07dd8dcb8fc74b658466b8dd47546cefffab1d
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 14 | ||||
| -rw-r--r-- | rootdir/init.zygote32.rc | 2 | ||||
| -rw-r--r-- | rootdir/init.zygote32_64.rc | 4 | ||||
| -rw-r--r-- | rootdir/init.zygote64.rc | 2 | ||||
| -rw-r--r-- | rootdir/init.zygote64_32.rc | 4 |
5 files changed, 20 insertions, 6 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 91d6697b5..4a74a8fc8 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -52,6 +52,17 @@ on init chown root system /sys/fs/cgroup/memory/sw/tasks chmod 0660 /sys/fs/cgroup/memory/sw/tasks + # Create energy-aware scheduler tuning nodes + mkdir /sys/fs/cgroup/stune + mount cgroup none /sys/fs/cgroup/stune schedtune + mkdir /sys/fs/cgroup/stune/foreground + chown system system /sys/fs/cgroup/stune + chown system system /sys/fs/cgroup/stune/foreground + chown system system /sys/fs/cgroup/stune/tasks + chown system system /sys/fs/cgroup/stune/foreground/tasks + chmod 0664 /sys/fs/cgroup/stune/tasks + chmod 0664 /sys/fs/cgroup/stune/foreground/tasks + # Mount staging areas for devices managed by vold # See storage config details at http://source.android.com/tech/storage/ mount tmpfs tmpfs /mnt mode=0755,uid=0,gid=1000 @@ -163,13 +174,16 @@ on init chown system system /dev/cpuset/foreground chown system system /dev/cpuset/foreground/boost chown system system /dev/cpuset/background + chown system system /dev/cpuset/system-background chown system system /dev/cpuset/tasks chown system system /dev/cpuset/foreground/tasks chown system system /dev/cpuset/foreground/boost/tasks chown system system /dev/cpuset/background/tasks + chown system system /dev/cpuset/system-background/tasks chmod 0664 /dev/cpuset/foreground/tasks chmod 0664 /dev/cpuset/foreground/boost/tasks chmod 0664 /dev/cpuset/background/tasks + chmod 0664 /dev/cpuset/system-background/tasks chmod 0664 /dev/cpuset/tasks diff --git a/rootdir/init.zygote32.rc b/rootdir/init.zygote32.rc index ff25ac227..0ca38b9cd 100644 --- a/rootdir/init.zygote32.rc +++ b/rootdir/init.zygote32.rc @@ -5,4 +5,4 @@ service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-sys onrestart write /sys/power/state on onrestart restart media onrestart restart netd - writepid /dev/cpuset/foreground/tasks + writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks diff --git a/rootdir/init.zygote32_64.rc b/rootdir/init.zygote32_64.rc index 29bb1cf2e..1646c0f7e 100644 --- a/rootdir/init.zygote32_64.rc +++ b/rootdir/init.zygote32_64.rc @@ -5,10 +5,10 @@ service zygote /system/bin/app_process32 -Xzygote /system/bin --zygote --start-s onrestart write /sys/power/state on onrestart restart media onrestart restart netd - writepid /dev/cpuset/foreground/tasks + writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks service zygote_secondary /system/bin/app_process64 -Xzygote /system/bin --zygote --socket-name=zygote_secondary class main socket zygote_secondary stream 660 root system onrestart restart zygote - writepid /dev/cpuset/foreground/tasks
\ No newline at end of file + writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks diff --git a/rootdir/init.zygote64.rc b/rootdir/init.zygote64.rc index 5497524e4..b477c8ef2 100644 --- a/rootdir/init.zygote64.rc +++ b/rootdir/init.zygote64.rc @@ -5,4 +5,4 @@ service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-s onrestart write /sys/power/state on onrestart restart media onrestart restart netd - writepid /dev/cpuset/foreground/tasks + writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks diff --git a/rootdir/init.zygote64_32.rc b/rootdir/init.zygote64_32.rc index 8ed5e9ee8..633a98108 100644 --- a/rootdir/init.zygote64_32.rc +++ b/rootdir/init.zygote64_32.rc @@ -5,10 +5,10 @@ service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-s onrestart write /sys/power/state on onrestart restart media onrestart restart netd - writepid /dev/cpuset/foreground/tasks + writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote --socket-name=zygote_secondary class main socket zygote_secondary stream 660 root system onrestart restart zygote - writepid /dev/cpuset/foreground/tasks
\ No newline at end of file + writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks |