Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a5d0c80 authored by Ravi Kumar Siddojigari's avatar Ravi Kumar Siddojigari Committed by android-build-merger
Browse files

Merge "init: set SetKptrRestrict before early-init" 

am: 88bba959

Change-Id: I1822bff084659d744190526987abcc220ae58d45
parents dab12cfb 88bba959

init/init.cpp

+1 −1
Original line number Diff line number Diff line
@@ -764,6 +764,7 @@ int SecondStageMain(int argc, char** argv) { 


    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 @@ int SecondStageMain(int argc, char** argv) { 
    // ... 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> {