aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-06-30 15:20:49 +0200
committerErlang/OTP <[email protected]>2017-06-30 15:20:49 +0200
commit27d6223822ae3fa51a699dde8ac641137daaca40 (patch)
tree92ddd227b16777d3d3b4df120be069c3ee56646e /erts
parent9d90c6e3217552bbc9801b52094c9b5c7539ace5 (diff)
parentdbbf643c632a175a28ea39ba780947ff13eca039 (diff)
downloadotp-27d6223822ae3fa51a699dde8ac641137daaca40.tar.gz
otp-27d6223822ae3fa51a699dde8ac641137daaca40.tar.bz2
otp-27d6223822ae3fa51a699dde8ac641137daaca40.zip
Merge branch 'sverker/prealloc-race-bug/OTP-14491' into maint-20
* 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 cab4bd73db..96238318c9 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);
}