aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-11-15 14:39:56 +0100
committerErlang/OTP <[email protected]>2017-11-15 14:39:56 +0100
commitbe217eca99db612279f889eaf2a4e31c44494292 (patch)
treed6a64b811661aa758e6570a7f45bd195bf8dff79 /erts
parent19e938e708bb4823d5deac94fd110b7d3896390a (diff)
parentdbbf643c632a175a28ea39ba780947ff13eca039 (diff)
downloadotp-be217eca99db612279f889eaf2a4e31c44494292.tar.gz
otp-be217eca99db612279f889eaf2a4e31c44494292.tar.bz2
otp-be217eca99db612279f889eaf2a4e31c44494292.zip
Merge branch 'sverker/prealloc-race-bug/OTP-14491' into maint-18
* sverker/prealloc-race-bug/OTP-14491: erts: Fix bug in quick alloc
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_sched_spec_pre_alloc.c2
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);
}