diff options
| author | Lukas Larsson <[email protected]> | 2018-12-06 11:53:18 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-12-06 11:53:18 +0100 |
| commit | ea7d6c39f2179b2240d55df4a1ddd515b6d32832 (patch) | |
| tree | 117436f49db44ee51a9b28c0cf94e094c31ed280 /erts/emulator/beam/erl_async.c | |
| parent | 551e15331967551307b1618248334b20dce3241c (diff) | |
| parent | 73e4f5f21bbf492ab61c01dee48fa09fd7309a50 (diff) | |
| download | otp-ea7d6c39f2179b2240d55df4a1ddd515b6d32832.tar.gz otp-ea7d6c39f2179b2240d55df4a1ddd515b6d32832.tar.bz2 otp-ea7d6c39f2179b2240d55df4a1ddd515b6d32832.zip | |
Merge branch 'maint'
Conflicts:
erts/emulator/beam/erl_process.c
Diffstat (limited to 'erts/emulator/beam/erl_async.c')
| -rw-r--r-- | erts/emulator/beam/erl_async.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_async.c b/erts/emulator/beam/erl_async.c index 605a2b3461..44655ad5df 100644 --- a/erts/emulator/beam/erl_async.c +++ b/erts/emulator/beam/erl_async.c @@ -336,7 +336,7 @@ static ERTS_INLINE ErtsAsync *async_get(ErtsThrQ_t *q, case ERTS_THR_Q_NEED_THR_PRGR: { ErtsThrPrgrVal prgr = erts_thr_q_need_thr_progress(q); - erts_thr_progress_wakeup(NULL, prgr); + erts_thr_progress_wakeup(erts_thr_prgr_data(NULL), prgr); /* * We do no dequeue finalizing in hope that a new async * job will arrive before we are woken due to thread |