summaryrefslogtreecommitdiff
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2020-05-19 16:42:33 +0200
committerErlang/OTP <otp@erlang.org>2020-05-19 16:42:33 +0200
commit9fa6661e061d3f7a14d9e99584f8768b627bca07 (patch)
tree91185aa4463ea00d0242437fea96ec5dfa7503c7 /erts
parent6d5a5f31c36bbdaad21585d25974177bd1b75e66 (diff)
parent514b735314e9c8d0c8abdf8047c00206c7b0590b (diff)
downloaderlang-9fa6661e061d3f7a14d9e99584f8768b627bca07.tar.gz
Merge branch 'rickard/delayed-gc-sys-task-bugfix/ERL-1236/OTP-16639' into maint-22
* 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.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 406336fea7..8f456dfb61 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -11183,7 +11183,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;