From f429d37807a005c1de38a7616669bf1834d45432 Mon Sep 17 00:00:00 2001
From: Tim Murray <timmurray@google.com>
Date: Thu, 15 Oct 2015 12:38:15 -0700
Subject: [PATCH] Reorder init.rc to avoid a kernel warning.
3.18 has a warning in dmesg that appears when the parent cpuset's cpus
and mems are changed to something other than what the child has. Reorder
init.rc to prevent this warning from appearing.
bug 24941443
Change-Id: I49d8394063b23dce03222dcc9ddccdc32bb97ea2
---
rootdir/init.rc | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 8ea72e8333..e814d0c580 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -140,23 +140,27 @@ on init
# sets up initial cpusets for ActivityManager
mkdir /dev/cpuset
mount cpuset none /dev/cpuset
+
+ # this ensures that the cpusets are present and usable, but the device's
+ # init.rc must actually set the correct cpus
mkdir /dev/cpuset/foreground
+ write /dev/cpuset/foreground/cpus 0
+ write /dev/cpuset/foreground/mems 0
mkdir /dev/cpuset/foreground/boost
+ write /dev/cpuset/foreground/boost/cpus 0
+ write /dev/cpuset/foreground/boost/mems 0
mkdir /dev/cpuset/background
+ write /dev/cpuset/background/cpus 0
+ write /dev/cpuset/background/mems 0
+
# 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
+ # to be used only by init, so don't change system-bg 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
+
+ # change permissions for all cpusets we'll touch at runtime
chown system system /dev/cpuset
chown system system /dev/cpuset/foreground
chown system system /dev/cpuset/foreground/boost
--
GitLab