Ensure that mlockall() applies even to already mapped pages.

[ert_linux.git] / ert_linux / ert_linux_main.tlc

diff --git a/ert_linux/ert_linux_main.tlc b/ert_linux/ert_linux_main.tlc
index 7b7e966cb77ff0ed64eb1c60b11a5afbe7dcc3f1..85830b63589244ecde3d3c8b9b83f2e6c29119d2 100644 (file)
--- a/ert_linux/ert_linux_main.tlc
+++ b/ert_linux/ert_linux_main.tlc
@@ -122,6 +122,7 @@
        %<modelName>_step%<i>();
        sem_wait(&sub_rate[%<i>].sem);    /* sem_val = 0 */
       }
+      return NULL;
     }
   %endforeach
 %endfunction
@@ -241,7 +242,7 @@
       (void *)(argv);
     %endif
 
-    CHECKE(mlockall(MCL_FUTURE));
+    CHECKE(mlockall(MCL_CURRENT | MCL_FUTURE));
 
     /* Initialize model */
     %<modelName>_initialize();