diff options
author | Lukas Larsson <[email protected]> | 2013-05-31 11:06:56 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2013-05-31 11:11:16 +0200 |
commit | df4fe8fac6425a85c5366e540b588b6e084ca798 (patch) | |
tree | 0268066840508ced6b79caba4eaf5c23ce15a0e0 /erts/emulator/beam/erl_process.c | |
parent | 9427db3cd66f840ade9649513d914271b0981bf4 (diff) | |
parent | fb4440038ea305929d7f46c0ea651994b412483f (diff) | |
download | otp-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_process.c')
-rw-r--r-- | erts/emulator/beam/erl_process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index bb3e787401..81799ddbb1 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -4671,8 +4671,8 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online) esdp->reductions = 0; init_sched_wall_time(&esdp->sched_wall_time); - erts_port_task_handle_init(&esdp->nosuspend_port_task_handle); + } init_misc_aux_work(); |