diff options
| author | Rickard Green <[email protected]> | 2016-05-04 14:47:28 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-05-04 14:47:28 +0200 |
| commit | eda89507c1f53e29b3c0be01b47c6cf278960cd6 (patch) | |
| tree | b3c8dba45b937e389b910e8c25051747214c8905 /erts | |
| parent | e7767ed5bd7dd770eab5096e0868701d59d1fa74 (diff) | |
| parent | f0a1185b95bc8d5c20954cbf5f70767f1f354cc8 (diff) | |
| download | otp-eda89507c1f53e29b3c0be01b47c6cf278960cd6.tar.gz otp-eda89507c1f53e29b3c0be01b47c6cf278960cd6.tar.bz2 otp-eda89507c1f53e29b3c0be01b47c6cf278960cd6.zip | |
Merge branch 'rickard/fix-sched-sys-task/OTP-13047'
* rickard/fix-sched-sys-task/OTP-13047:
Fix scheduling of system tasks
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index c6c3fd64a1..bc32f3f167 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -6688,10 +6688,8 @@ schedule_process_sys_task(Process *p, erts_aint32_t prio, ErtsProcSysTask *st) erts_aint32_t e; n = e = a; - if (a & ERTS_PSFLG_FREE) { - res = 0; + if (a & ERTS_PSFLG_FREE) goto cleanup; /* We don't want to schedule free processes... */ - } enqueue = ERTS_ENQUEUE_NOT; n |= ERTS_PSFLG_ACTIVE_SYS; |