commit a31a6f1676adba68c0ca43ba025db935d5e0e4ab
author Ravi Kumar Siddojigari <rsiddoji@codeaurora.org> Wed Aug 28 13:27:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 28 13:27:14 2019 -0700
tree 2f6d20164135fcedbff088f3d212dfde112a91f5
parent 06ab21446293912a9b7c7999c36be5cf3f69f519
parent e3d8f316d3b81c38d69cab888d1c5e09dda8156f

Merge "init: set SetKptrRestrict before early-init"
am: 88bba95989

Change-Id: I1822bff084659d744190526987abcc220ae58d45

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index e5d1036..742adee 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -764,6 +764,7 @@
 
     am.QueueBuiltinAction(SetupCgroupsAction, "SetupCgroups");
 
+    am.QueueBuiltinAction(SetKptrRestrictAction, "SetKptrRestrict");
     am.QueueEventTrigger("early-init");
 
     // Queue an action that waits for coldboot done so we know ueventd has set up all of /dev...
@@ -771,7 +772,6 @@
     // ... so that we can start queuing up actions that require stuff from /dev.
     am.QueueBuiltinAction(MixHwrngIntoLinuxRngAction, "MixHwrngIntoLinuxRng");
     am.QueueBuiltinAction(SetMmapRndBitsAction, "SetMmapRndBits");
-    am.QueueBuiltinAction(SetKptrRestrictAction, "SetKptrRestrict");
     Keychords keychords;
     am.QueueBuiltinAction(
             [&epoll, &keychords](const BuiltinArguments& args) -> Result<void> {