diff options
| author | John Högberg <[email protected]> | 2017-07-04 10:48:47 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-07-04 10:48:47 +0200 |
| commit | 522c3cca9ab2895e92984d46e1ca76b6d0aa1de9 (patch) | |
| tree | 06c6d37c4b0e91548e638f7a90554ac4395e1510 /erts/emulator | |
| parent | fcca55a9deb1cfaa107fbe5bf5d093decf423fcd (diff) | |
| parent | 4acf549207503d7c80cfbd9f0958aafd10da07d0 (diff) | |
| download | otp-522c3cca9ab2895e92984d46e1ca76b6d0aa1de9.tar.gz otp-522c3cca9ab2895e92984d46e1ca76b6d0aa1de9.tar.bz2 otp-522c3cca9ab2895e92984d46e1ca76b6d0aa1de9.zip | |
Merge branch 'maint'
* maint:
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.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 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); } |