commit 2b1acc97f39eb9386ae01e0975027d3428f9171e
author Daniel Colascione <dancol@google.com> Wed Jan 03 23:30:53 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 03 23:30:53 2018 +0000
tree 57e7f7b345bdfa7f09acfb467089536e2fc5a0f4
parent 7fca50dfb4681b001e7892b14e95d48b432b1788
parent 4cb5faa3c588623e871fc1468944e9c2e33064ee

Merge "Pin lmkd for real"
am: 625d1383d3

Change-Id: If813c79b3f321faa5fc34d70078c30c0966a3676

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index 5cfa2c8..fd83ecc 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -900,7 +900,9 @@
     downgrade_pressure = (int64_t)property_get_int32("ro.lmk.downgrade_pressure", 60);
     is_go_device = property_get_bool("ro.config.low_ram", false);
 
-    mlockall(MCL_FUTURE);
+    if (mlockall(MCL_CURRENT | MCL_FUTURE))
+        ALOGW("mlockall failed: errno=%d", errno);
+
     sched_setscheduler(0, SCHED_FIFO, &param);
     if (!init())
         mainloop();