aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-11-07 20:24:06 +0100
committerSverker Eriksson <[email protected]>2017-11-07 20:24:06 +0100
commitee806355a3beff5800bb15f3a931825fe15adcbb (patch)
treec3aacf1c77d2f0a7a81cf0cd20429b12e79f94dc /erts/emulator/beam
parent009739af6cb71b24f519ae053dbeabe0a170cc79 (diff)
parentd563fdd7f3bfa5df218e3965ca45a0348514a2a7 (diff)
downloadotp-ee806355a3beff5800bb15f3a931825fe15adcbb.tar.gz
otp-ee806355a3beff5800bb15f3a931825fe15adcbb.tar.bz2
otp-ee806355a3beff5800bb15f3a931825fe15adcbb.zip
Merge branch 'sverker/systask-reqid-bug'
* sverker/systask-reqid-bug: erts: Fix bug in systask scheduling
Diffstat (limited to 'erts/emulator/beam')
-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 6654468fb6..3c0a126fe2 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -10824,7 +10824,7 @@ request_system_task(Process *c_p, Eterm requester, Eterm target,
goto badarg;
req_type = tp[1];
req_id = tp[2];
- req_id_sz = is_immed(req_id) ? req_id : size_object(req_id);
+ req_id_sz = is_immed(req_id) ? 0 : size_object(req_id);
tot_sz = req_id_sz;
for (i = 0; i < ERTS_MAX_PROC_SYS_TASK_ARGS; i++) {
int tix = 3 + i;