diff options
| author | Rickard Green <[email protected]> | 2012-08-02 17:42:25 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-08-02 17:42:25 +0200 |
| commit | da6ea485c20727fe63bb365f34e40ccb8570d413 (patch) | |
| tree | 4f63bc6a6cc31b9cb65613d5a770a8305605b9ce /erts/emulator/beam/erl_thr_queue.c | |
| parent | ff1a1e3c6f9a233b880e9d359a1c50e55d7c812f (diff) | |
| parent | 2e5c1dbb32cfe4be0a782216953b4630338edabc (diff) | |
| download | otp-da6ea485c20727fe63bb365f34e40ccb8570d413.tar.gz otp-da6ea485c20727fe63bb365f34e40ccb8570d413.tar.bz2 otp-da6ea485c20727fe63bb365f34e40ccb8570d413.zip | |
Merge 'rickard/thr-prgr-use/OTP-10116' and 'rickard/proc-sched/OTP-9892'
Conflicts:
erts/emulator/beam/erl_process.c
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); |