aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2017-07-04 10:45:51 +0200
committerJohn Högberg <[email protected]>2017-07-04 10:45:51 +0200
commit4acf549207503d7c80cfbd9f0958aafd10da07d0 (patch)
treebbe950aa6dd6d4ac264af149571ebf8113c77135 /erts/emulator
parentf07821b47f8dcf69be22277e316167491a2ef295 (diff)
parenta01de6873844ba510084090abec734c4166d71fa (diff)
downloadotp-4acf549207503d7c80cfbd9f0958aafd10da07d0.tar.gz
otp-4acf549207503d7c80cfbd9f0958aafd10da07d0.tar.bz2
otp-4acf549207503d7c80cfbd9f0958aafd10da07d0.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Update release notes Update version numbers erts: Fix bug in quick alloc Fix old length usage in string stdlib: Fix bug in proc_lib Support arbitrary crash report in proc_lib.
Diffstat (limited to 'erts/emulator')
-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);
}