aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_init.c
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-05-31 11:06:56 +0200
committerLukas Larsson <[email protected]>2013-05-31 11:11:16 +0200
commitdf4fe8fac6425a85c5366e540b588b6e084ca798 (patch)
tree0268066840508ced6b79caba4eaf5c23ce15a0e0 /erts/emulator/beam/erl_init.c
parent9427db3cd66f840ade9649513d914271b0981bf4 (diff)
parentfb4440038ea305929d7f46c0ea651994b412483f (diff)
downloadotp-df4fe8fac6425a85c5366e540b588b6e084ca798.tar.gz
otp-df4fe8fac6425a85c5366e540b588b6e084ca798.tar.bz2
otp-df4fe8fac6425a85c5366e540b588b6e084ca798.zip
Merge branch 'lukas/erts/gc_stat_contention/OTP-10271' into maint
* lukas/erts/gc_stat_contention/OTP-10271: Replace gc stat lock with sched spec data
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
-rw-r--r--erts/emulator/beam/erl_init.c2
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);