diff options
| author | Rickard Green <[email protected]> | 2016-09-06 12:19:58 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-09-06 12:19:58 +0200 |
| commit | 54d2c59241d9f4e604a3d886721e657bdeaf0d8d (patch) | |
| tree | 3c6a635d81dc21cc0bbc1b5721be345afd39351d /erts/emulator | |
| parent | 5cc2afeaa6e617e393f573d3386fcc3bc483c8ff (diff) | |
| parent | 54aeaff05a88e83c2ee174b53da2b00ac101c6db (diff) | |
| download | otp-54d2c59241d9f4e604a3d886721e657bdeaf0d8d.tar.gz otp-54d2c59241d9f4e604a3d886721e657bdeaf0d8d.tar.bz2 otp-54d2c59241d9f4e604a3d886721e657bdeaf0d8d.zip | |
Merge branch 'maint'
* maint:
Fix erts_thr_progress_unmanaged_delay()
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_thr_progress.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_thr_progress.c b/erts/emulator/beam/erl_thr_progress.c index 26d71f573f..700ed90def 100644 --- a/erts/emulator/beam/erl_thr_progress.c +++ b/erts/emulator/beam/erl_thr_progress.c @@ -700,6 +700,7 @@ leader_update(ErtsThrPrgrData *tpd) tpd->leader_state.chk_next_ix = no_managed; erts_atomic32_set_nob(&intrnl->misc.data.umrefc_ix.current, (erts_aint32_t) new_umrefc_ix); + tpd->leader_state.umrefc_ix.current = new_umrefc_ix; ETHR_MEMBAR(ETHR_StoreLoad); refc = erts_atomic_read_nob(&intrnl->umrefc[umrefc_ix].refc); ASSERT(refc >= 0); |