diff options
| author | Erlang/OTP <otp@erlang.org> | 2020-05-19 17:06:45 +0200 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2020-05-19 17:06:45 +0200 |
| commit | 71198f1a1e3ec2d68451fdb323cd664db099a074 (patch) | |
| tree | 7224ce68218df49c95347ccf42fe4d7aa099a15c /erts | |
| parent | 2cff1df7d6ba2ac8280fc1dfcde273bcd53b5727 (diff) | |
| parent | 514b735314e9c8d0c8abdf8047c00206c7b0590b (diff) | |
| download | erlang-71198f1a1e3ec2d68451fdb323cd664db099a074.tar.gz | |
Merge branch 'rickard/delayed-gc-sys-task-bugfix/ERL-1236/OTP-16639' into maint-21
* rickard/delayed-gc-sys-task-bugfix/ERL-1236/OTP-16639:
Fix inconsistent merge of delayed sys-tasks with other sys-tasks
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 2c4bd2b0f5..620d8f6af8 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -11136,7 +11136,7 @@ erts_set_gc_state(Process *c_p, int enable) first1 = dgc_tsk_qs->q[prio]; last1 = first1->prev; first2 = stsk_qs->q[prio]; - last2 = first1->prev; + last2 = first2->prev; last1->next = first2; first2->prev = last1; |