diff options
| author | Lukas Larsson <[email protected]> | 2016-07-14 15:58:19 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-07-14 15:58:19 +0200 |
| commit | eeebefc37ae342f3d7cbbd329b6d75d3963e4811 (patch) | |
| tree | 5260ef8fff4795c63f4c0cac24f1fe9e0a262a5e /erts/emulator/beam/erl_init.c | |
| parent | 407156221fc55f4fbacbff752a6bd28cdbb59249 (diff) | |
| parent | f7b0cbbab08f2d3f733dfe2e201ce0ff614daaf3 (diff) | |
| download | otp-eeebefc37ae342f3d7cbbd329b6d75d3963e4811.tar.gz otp-eeebefc37ae342f3d7cbbd329b6d75d3963e4811.tar.bz2 otp-eeebefc37ae342f3d7cbbd329b6d75d3963e4811.zip | |
Merge branch 'maint'
Conflicts:
erts/emulator/Makefile.in
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index fbdafec4ef..2239b6f045 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -332,8 +332,6 @@ erl_init(int ncpu, int node_tab_delete_delay, ErtsDbSpinCount db_spin_count) { - init_benchmarking(); - erts_bif_unique_init(); erts_init_monitors(); erts_init_time(time_correction, time_warp_mode); @@ -2345,8 +2343,6 @@ erts_exit_vv(int n, int flush_async, char *fmt, va_list args1, va_list args2) { system_cleanup(flush_async); - save_statistics(); - if (erts_mtrace_enabled) erts_mtrace_exit((Uint32) n); |