diff options
| author | Rickard Green <[email protected]> | 2012-06-20 14:12:10 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-06-20 14:12:10 +0200 |
| commit | ba8fb1d9939d070fc67f959a2041d965929fed35 (patch) | |
| tree | 012e27bf414fb05c90be19b8215d1906bcbc277f /erts/emulator/beam/erl_thr_queue.c | |
| parent | c6b0348bb4ab8e3603b06b9e58dcbca2641bd35a (diff) | |
| parent | 2e5c1dbb32cfe4be0a782216953b4630338edabc (diff) | |
| download | otp-ba8fb1d9939d070fc67f959a2041d965929fed35.tar.gz otp-ba8fb1d9939d070fc67f959a2041d965929fed35.tar.bz2 otp-ba8fb1d9939d070fc67f959a2041d965929fed35.zip | |
Merge branch 'rickard/thr-prgr-use/OTP-10116' into maint
* rickard/thr-prgr-use/OTP-10116:
Fix faulty use of thread progress in handle_aux_work()
Diffstat (limited to 'erts/emulator/beam/erl_thr_queue.c')
| -rw-r--r-- | erts/emulator/beam/erl_thr_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_thr_queue.c b/erts/emulator/beam/erl_thr_queue.c index 70949ece76..f07964a265 100644 --- a/erts/emulator/beam/erl_thr_queue.c +++ b/erts/emulator/beam/erl_thr_queue.c @@ -422,7 +422,7 @@ clean(ErtsThrQ_t *q, int max_ops, int do_notify) else { q->head.next.unref_end = (ErtsThrQElement_t *) ilast; #ifdef ERTS_SMP - q->head.next.thr_progress = erts_thr_progress_later(); + q->head.next.thr_progress = erts_thr_progress_later(NULL); #endif erts_atomic32_set_relb(&q->tail.data.um_refc_ix, um_refc_ix); |