diff options
author | Rickard Green <[email protected]> | 2012-06-20 14:22:19 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2012-06-20 14:22:19 +0200 |
commit | 7f66a86b79c29f41ad5c787f014a28bbabcfea06 (patch) | |
tree | aaa08caba091f9df945a0d99cde08f3241bacdf0 /erts/emulator/beam/erl_sched_spec_pre_alloc.c | |
parent | 00dee07f0480994a303e16c803d367c34c2a7f26 (diff) | |
parent | ba8fb1d9939d070fc67f959a2041d965929fed35 (diff) | |
download | otp-7f66a86b79c29f41ad5c787f014a28bbabcfea06.tar.gz otp-7f66a86b79c29f41ad5c787f014a28bbabcfea06.tar.bz2 otp-7f66a86b79c29f41ad5c787f014a28bbabcfea06.zip |
Merge branch 'maint'
* maint:
Fix faulty use of thread progress in handle_aux_work()
Conflicts:
erts/emulator/beam/erl_process.c
Needed modifications:
erts/emulator/beam/beam_bif_load.c
Diffstat (limited to 'erts/emulator/beam/erl_sched_spec_pre_alloc.c')
-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 bff9d246a3..37b186abd9 100644 --- a/erts/emulator/beam/erl_sched_spec_pre_alloc.c +++ b/erts/emulator/beam/erl_sched_spec_pre_alloc.c @@ -227,7 +227,7 @@ fetch_remote(erts_sspa_chunk_header_t *chdr, int max) ERTS_THR_MEMORY_BARRIER; else { chdr->head.next.unref_end = (erts_sspa_blk_t *) ilast; - chdr->head.next.thr_progress = erts_thr_progress_later(); + chdr->head.next.thr_progress = erts_thr_progress_later(NULL); erts_atomic32_set_relb(&chdr->tail.data.um_refc_ix, um_refc_ix); chdr->head.next.um_refc_ix = um_refc_ix == 0 ? 1 : 0; |