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

Commit 011f5a20 authored by Wei Wang's avatar Wei Wang Committed by android-build-merger
Browse files

Merge "init: set oom_adj early before fork vendor_init" am: a7c103eb 

am: 099ffa2f

Change-Id: I8882ccf5f3532fd5da9b6d20bb019a10d65fd86b
parents 2b82b147 099ffa2f

init/init.cpp

+5 −0
Original line number Diff line number Diff line
@@ -630,6 +630,11 @@ int SecondStageMain(int argc, char** argv) { 
    InitKernelLogging(argv, InitAborter);

    LOG(INFO) << "init second stage started!";



    // Set init and its forked children's oom_adj.

    if (auto result = WriteFile("/proc/1/oom_score_adj", "-1000"); !result) {

        LOG(ERROR) << "Unable to write -1000 to /proc/1/oom_score_adj: " << result.error();

    }



    // Enable seccomp if global boot option was passed (otherwise it is enabled in zygote).

    GlobalSeccomp();

rootdir/init.rc

+0 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ import /init.${ro.zygote}.rc 


# Cgroups are mounted right before early-init using list from /etc/cgroups.json

on early-init

    # Set init and its forked children's oom_adj.

    write /proc/1/oom_score_adj -1000



    # Disable sysrq from keyboard

    write /proc/sys/kernel/sysrq 0