2 files changed, 8 insertions, 4 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index 51366adf1d..4b2edace0a 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -412,6 +412,10 @@ erts_sys_pre_init(void)
 
     erts_thr_init(&eid);
 
+#ifdef ERTS_ENABLE_LOCK_CHECK
+    erts_lc_init();
+#endif
+
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_init();
 #endif
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index 404e72d176..f3881e0736 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -3186,16 +3186,16 @@ erts_sys_pre_init(void)
     eid.thread_create_parent_func = thr_create_cleanup;
 
     erts_thr_init(&eid);
+#ifdef ERTS_ENABLE_LOCK_CHECK
+    erts_lc_init();
 #endif
-
-    erts_init_sys_time_sup();
-
-#ifdef USE_THREADS
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_init();
 #endif
 #endif
 
+    erts_init_sys_time_sup();
+
     erts_smp_atomic_init_nob(&sys_misc_mem_sz, 0);
 }