aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_init.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-11-25 15:23:54 +0100
committerRickard Green <[email protected]>2016-11-25 15:23:54 +0100
commitad8c29d74e4cf43f48f2ce11aeea451ad51a7e45 (patch)
treeaf20460b285b5807dcb77defd638d816dc5daf45 /erts/emulator/beam/erl_init.c
parent0fccaf80ab2348bbb99b7d2d8c25a3de77eebdeb (diff)
parentf8aef2dcae7162b59efb9513442c9643c9f5159e (diff)
downloadotp-ad8c29d74e4cf43f48f2ce11aeea451ad51a7e45.tar.gz
otp-ad8c29d74e4cf43f48f2ce11aeea451ad51a7e45.tar.bz2
otp-ad8c29d74e4cf43f48f2ce11aeea451ad51a7e45.zip
Merge branch 'maint'
* maint: Fix initialization dependencies between time, lock-check and lcnt
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
-rw-r--r--erts/emulator/beam/erl_init.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 165c440f71..c5904b375e 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -795,9 +795,6 @@ early_init(int *argc, char **argv) /*
erts_thr_progress_pre_init();
#endif
-#ifdef ERTS_ENABLE_LOCK_CHECK
- erts_lc_init();
-#endif
#ifdef ERTS_SMP
erts_smp_atomic32_init_nob(&erts_writing_erl_crash_dump, 0L);
erts_tsd_key_create(&erts_is_crash_dumping_key,"erts_is_crash_dumping_key");