aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_init.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-06-03 16:19:30 +0200
committerSverker Eriksson <[email protected]>2015-06-15 14:13:13 +0200
commitc09561dc51be736943a32862a41a3eaef2e41b83 (patch)
tree0ce32c8ed890f60b936fff4682c9bf5cfc5586ee /erts/emulator/beam/erl_init.c
parenteea59350ddc1f8c2d86e10f5d38f0cda2f9081f3 (diff)
downloadotp-c09561dc51be736943a32862a41a3eaef2e41b83.tar.gz
otp-c09561dc51be736943a32862a41a3eaef2e41b83.tar.bz2
otp-c09561dc51be736943a32862a41a3eaef2e41b83.zip
erts: Yield in maps:merge
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
-rw-r--r--erts/emulator/beam/erl_init.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 988ff0e2b5..98ab9f598f 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -379,6 +379,7 @@ erl_init(int ncpu,
erts_init_bif_re();
erts_init_unicode(); /* after RE to get access to PCRE unicode */
erts_init_external();
+ erts_init_map();
erts_delay_trap = erts_export_put(am_erlang, am_delay_trap, 2);
erts_late_init_process();
#if HAVE_ERTS_MSEG