summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSan Mehat <san@google.com>2009-10-07 11:55:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-07 11:55:14 -0700
commitb0cc66698fde10592638fee13a8db75b2df1ecf5 (patch)
tree5191d84cf8719097a0dc3f49303d373ecc071b09
parent211aca20272c1132c2120fba95db879876acb5e5 (diff)
parent529520e8240e6865aca77ae9abf78dacbaa72e2c (diff)
downloadsystem_core-b0cc66698fde10592638fee13a8db75b2df1ecf5.zip
system_core-b0cc66698fde10592638fee13a8db75b2df1ecf5.tar.gz
system_core-b0cc66698fde10592638fee13a8db75b2df1ecf5.tar.bz2
am 529520e8: Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"
Merge commit '529520e8240e6865aca77ae9abf78dacbaa72e2c' into eclair-plus-aosp * commit '529520e8240e6865aca77ae9abf78dacbaa72e2c': Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"
-rw-r--r--rootdir/init.rc36
1 files changed, 18 insertions, 18 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 034e378..8d1aff4 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -38,24 +38,24 @@ loglevel 3
write /proc/sys/kernel/sched_compat_yield 1
write /proc/sys/kernel/sched_child_runs_first 0
-## Create cgroup mount points for process groups
-# mkdir /dev/cpuctl
-# mount cgroup none /dev/cpuctl cpu
-# chown sytem system /dev/cpuctl
-# chown system system /dev/cpuctl/tasks
-# chmod 0777 /dev/cpuctl/tasks
-# write /dev/cpuctl/cpu.shares 1024
-#
-# mkdir /dev/cpuctl/fg_boost
-# chown system system /dev/cpuctl/fg_boost/tasks
-# chmod 0777 /dev/cpuctl/fg_boost/tasks
-# write /dev/cpuctl/fg_boost/cpu.shares 1024
-#
-# mkdir /dev/cpuctl/bg_non_interactive
-# chown system system /dev/cpuctl/bg_non_interactive/tasks
-# chmod 0777 /dev/cpuctl/bg_non_interactive/tasks
-# # 5.0 %
-# write /dev/cpuctl/bg_non_interactive/cpu.shares 52
+# Create cgroup mount points for process groups
+ mkdir /dev/cpuctl
+ mount cgroup none /dev/cpuctl cpu
+ chown sytem system /dev/cpuctl
+ chown system system /dev/cpuctl/tasks
+ chmod 0777 /dev/cpuctl/tasks
+ write /dev/cpuctl/cpu.shares 1024
+
+ mkdir /dev/cpuctl/fg_boost
+ chown system system /dev/cpuctl/fg_boost/tasks
+ chmod 0777 /dev/cpuctl/fg_boost/tasks
+ write /dev/cpuctl/fg_boost/cpu.shares 1024
+
+ mkdir /dev/cpuctl/bg_non_interactive
+ chown system system /dev/cpuctl/bg_non_interactive/tasks
+ chmod 0777 /dev/cpuctl/bg_non_interactive/tasks
+ # 5.0 %
+ write /dev/cpuctl/bg_non_interactive/cpu.shares 52
# mount mtd partitions
# Mount /system rw first to give the filesystem a chance to save a checkpoint