commit f4edc7d199ef43893b5a993a7643426465bad3f1
author Daniel Colascione <dancol@google.com> Wed Jan 03 23:40:48 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 03 23:40:48 2018 +0000
tree 5a66450180dd9b20bcd44c15fcb77c5b5a7e050c
parent 768f9cb5e6b1cfe620e751391f0bdac903c1aa37
parent 2b1acc97f39eb9386ae01e0975027d3428f9171e

Merge "Pin lmkd for real" am: 625d1383d3
am: da0d209ba1

Change-Id: I774bef622b77a1cfb5cfd1b8efbe0e2bb92ea422

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();