summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2020-05-20 09:57:28 +0200
committerErlang/OTP <otp@erlang.org>2020-05-20 09:57:28 +0200
commit26079ffc8745b6c8605dc72bded596601d3defa0 (patch)
treeb6ae3dda0920d79393ec0c165d9a829d1bf52f3c
parent7a8d04dbcb388a5d837a213ad249c1b96e19e998 (diff)
parent514b735314e9c8d0c8abdf8047c00206c7b0590b (diff)
downloaderlang-26079ffc8745b6c8605dc72bded596601d3defa0.tar.gz
Merge branch 'rickard/delayed-gc-sys-task-bugfix/ERL-1236/OTP-16639' into maint-23
* rickard/delayed-gc-sys-task-bugfix/ERL-1236/OTP-16639: Fix inconsistent merge of delayed sys-tasks with other sys-tasks
-rw-r--r--erts/emulator/beam/erl_process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 0a1e274396..6c83693df8 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -11188,7 +11188,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;