diff options
| author | Erlang/OTP <otp@erlang.org> | 2017-11-15 14:39:56 +0100 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2017-11-15 14:39:56 +0100 |
| commit | be217eca99db612279f889eaf2a4e31c44494292 (patch) | |
| tree | d6a64b811661aa758e6570a7f45bd195bf8dff79 | |
| parent | 19e938e708bb4823d5deac94fd110b7d3896390a (diff) | |
| parent | dbbf643c632a175a28ea39ba780947ff13eca039 (diff) | |
| download | erlang-be217eca99db612279f889eaf2a4e31c44494292.tar.gz | |
Merge branch 'sverker/prealloc-race-bug/OTP-14491' into maint-18
* sverker/prealloc-race-bug/OTP-14491:
erts: Fix bug in quick alloc
| -rw-r--r-- | erts/emulator/beam/erl_sched_spec_pre_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_sched_spec_pre_alloc.c b/erts/emulator/beam/erl_sched_spec_pre_alloc.c index caec24bc03..ca2d834381 100644 --- a/erts/emulator/beam/erl_sched_spec_pre_alloc.c +++ b/erts/emulator/beam/erl_sched_spec_pre_alloc.c @@ -161,7 +161,7 @@ enqueue_remote_managed_thread(erts_sspa_chunk_header_t *chdr, if ((i & 1) == 0) itmp = itmp2; else { - enq = (erts_sspa_blk_t *) itmp; + enq = (erts_sspa_blk_t *) itmp2; itmp = erts_atomic_read_acqb(&enq->next_atmc); ASSERT(itmp != ERTS_AINT_NULL); } |