diff options
| author | Rickard Green <[email protected]> | 2016-02-19 16:47:14 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-02-19 16:47:14 +0100 |
| commit | 63908f5313781e199476dc0def4eb0dcaa939d88 (patch) | |
| tree | fe35644d3d3be163072e1b3b3abea415ab75fa7f /erts | |
| parent | d0002b70b1f948dcef3e08781b9db589907776c5 (diff) | |
| parent | a4d6c798135440eadfba4832ac3cf77b06b6ac4f (diff) | |
| download | otp-63908f5313781e199476dc0def4eb0dcaa939d88.tar.gz otp-63908f5313781e199476dc0def4eb0dcaa939d88.tar.bz2 otp-63908f5313781e199476dc0def4eb0dcaa939d88.zip | |
Merge branch 'rickard/rq-state-bug/OTP-13298' into maint
* rickard/rq-state-bug/OTP-13298:
Fix bug causing run-queue mask to become inconsistent
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 799e49005c..cbc2696eab 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -1187,7 +1187,7 @@ void erts_check_for_holes(Process* p); #define ERTS_PSFLGS_GET_USR_PRIO(PSFLGS) \ (((PSFLGS) >> ERTS_PSFLGS_USR_PRIO_OFFSET) & ERTS_PSFLGS_PRIO_MASK) #define ERTS_PSFLGS_GET_PRQ_PRIO(PSFLGS) \ - (((PSFLGS) >> ERTS_PSFLGS_USR_PRIO_OFFSET) & ERTS_PSFLGS_PRIO_MASK) + (((PSFLGS) >> ERTS_PSFLGS_PRQ_PRIO_OFFSET) & ERTS_PSFLGS_PRIO_MASK) /* * Static flags that do not change after process creation. |