Remove mlock as option for backend too

2 files changed, 1 insertions, 2 deletions

diff --git a/searchlib/src/apps/docstore/benchmarkdatastore.cpp b/searchlib/src/apps/docstore/benchmarkdatastore.cpp
index 20f06a087f5..5277c71cea2 100644
--- a/searchlib/src/apps/docstore/benchmarkdatastore.cpp
+++ b/searchlib/src/apps/docstore/benchmarkdatastore.cpp
@@ -29,7 +29,7 @@ class BenchmarkDataStoreApp : public FastOS_Application
 void
 BenchmarkDataStoreApp::usage()
 {
-    printf("Usage: %s <direcory> <numreads> <numthreads> <objects per read> <normal,directio,mmap,mlock>\n", _argv[0]);
+    printf("Usage: %s <direcory> <numreads> <numthreads> <objects per read> <normal,directio,mmap>\n", _argv[0]);
     fflush(stdout);
 }
 
diff --git a/searchlib/src/vespa/searchlib/common/tunefileinfo.hpp b/searchlib/src/vespa/searchlib/common/tunefileinfo.hpp
index 7cba56d5d72..a99bf8fcfd0 100644
--- a/searchlib/src/vespa/searchlib/common/tunefileinfo.hpp
+++ b/searchlib/src/vespa/searchlib/common/tunefileinfo.hpp
@@ -26,7 +26,6 @@ TuneFileRandRead::setFromMmapConfig(const MMapConfig & mmapFlags) {
     for (size_t i(0), m(mmapFlags.options.size()); i < m; i++) {
 #ifdef __linux__
         switch (mmapFlags.options[i]) {
-            case MMapConfig::Options::MLOCK:    _mmapFlags |= MAP_LOCKED; break;
             case MMapConfig::Options::POPULATE: _mmapFlags |= MAP_POPULATE; break;
             case MMapConfig::Options::HUGETLB:  _mmapFlags |= MAP_HUGETLB; break;
         }