diff options
| author | Rickard Green <[email protected]> | 2014-06-06 01:49:42 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-06 01:49:42 +0200 |
| commit | c54a0025e6a4d152ba73e92a2007052ebde391bf (patch) | |
| tree | 96547f56d48c53d197a5a70acd167c0bdcdaf4af /erts/emulator/beam/erl_init.c | |
| parent | d30fd47e2e886094d72d8dcb00f1392cabeda23f (diff) | |
| parent | 8b4659d5246166cef9b8e9aa91c644e3b3ec66d5 (diff) | |
| download | otp-c54a0025e6a4d152ba73e92a2007052ebde391bf.tar.gz otp-c54a0025e6a4d152ba73e92a2007052ebde391bf.tar.bz2 otp-c54a0025e6a4d152ba73e92a2007052ebde391bf.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index d54658f1ea..5e6d812242 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -324,7 +324,6 @@ erl_init(int ncpu, BIN_VH_MIN_SIZE = erts_next_heap_size(BIN_VH_MIN_SIZE, 0); erts_init_trace(); - erts_init_binary(); erts_init_bits(); erts_code_ix_init(); erts_init_fun_table(); @@ -337,6 +336,7 @@ erl_init(int ncpu, erts_ddll_init(); init_emulator(); erts_ptab_init(); /* Must be after init_emulator() */ + erts_init_binary(); /* Must be after init_emulator() */ erts_bp_init(); init_db(); /* Must be after init_emulator */ erts_bif_timer_init(); |