aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-07-25 09:46:58 +0200
committerErlang/OTP <[email protected]>2017-07-25 09:46:58 +0200
commitd3671d9cbeb7a14efb6b3900fefe6044de364c8d (patch)
tree762b7fff9b7c48c6021a7f9145eec56682cab038 /erts
parent8d9cde83b628533ae7a5fe85a5dd9c6c00c084e3 (diff)
parentdbbf643c632a175a28ea39ba780947ff13eca039 (diff)
downloadotp-d3671d9cbeb7a14efb6b3900fefe6044de364c8d.tar.gz
otp-d3671d9cbeb7a14efb6b3900fefe6044de364c8d.tar.bz2
otp-d3671d9cbeb7a14efb6b3900fefe6044de364c8d.zip
Merge branch 'sverker/prealloc-race-bug/OTP-14491' into maint-19
* 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);
}