commit 039d3f244f0dd8c4079c7c498edaa23eb9346e18
author Daniel Colascione <dancol@google.com> Thu Jan 04 00:07:38 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 04 00:07:38 2018 +0000
tree 992025b4dd9da821bd9cecf8ca4359a70c708656
parent 1cdefa63fb50981b31892b0994c11fedbb757cdb
parent f4edc7d199ef43893b5a993a7643426465bad3f1

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

Change-Id: I9d33771ba840cbf6517c23d250d31c83dd65987c

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