diff options
| author | Lukas Larsson <[email protected]> | 2013-05-31 11:16:06 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-05-31 11:16:06 +0200 |
| commit | 04b4086965b628c43d31eec3063e2d614914276b (patch) | |
| tree | 96436c96bfb430cbe246c1a5888b451dea00de06 /erts/emulator/beam/erl_init.c | |
| parent | 9226ff2e22e6e17594f26db4d3e7a9e67c869007 (diff) | |
| parent | df4fe8fac6425a85c5366e540b588b6e084ca798 (diff) | |
| download | otp-04b4086965b628c43d31eec3063e2d614914276b.tar.gz otp-04b4086965b628c43d31eec3063e2d614914276b.tar.bz2 otp-04b4086965b628c43d31eec3063e2d614914276b.zip | |
Merge branch 'maint'
* maint:
Replace gc stat lock with sched spec data
Conflicts:
erts/preloaded/ebin/erlang.beam
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 b5bac2151d..b3a3c3d403 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -300,13 +300,13 @@ erl_init(int ncpu, init_benchmarking(); erts_init_monitors(); - erts_init_gc(); erts_init_time(); erts_init_sys_common_misc(); erts_init_process(ncpu, proc_tab_sz, legacy_proc_tab); erts_init_scheduling(no_schedulers, no_schedulers_online); erts_init_cpu_topology(); /* Must be after init_scheduling */ + erts_init_gc(); /* Must be after init_scheduling */ erts_alloc_late_init(); H_MIN_SIZE = erts_next_heap_size(H_MIN_SIZE, 0); |