diff options
| author | Erlang/OTP <[email protected]> | 2016-03-10 13:10:33 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-03-10 13:10:33 +0100 |
| commit | 018849331dff18342c9e620e1a1202b5a5ff35f8 (patch) | |
| tree | f3f7584b381d42273b70482bd39beb018b9239f8 | |
| parent | d5ea95b5bc1d334ecac312da7e8d92ee1e81377a (diff) | |
| parent | a4d6c798135440eadfba4832ac3cf77b06b6ac4f (diff) | |
| download | otp-018849331dff18342c9e620e1a1202b5a5ff35f8.tar.gz otp-018849331dff18342c9e620e1a1202b5a5ff35f8.tar.bz2 otp-018849331dff18342c9e620e1a1202b5a5ff35f8.zip | |
Merge branch 'rickard/rq-state-bug/OTP-13298' into maint-17
* rickard/rq-state-bug/OTP-13298:
Fix bug causing run-queue mask to become inconsistent
| -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 f50b217d4a..0db81de570 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -1091,7 +1091,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) /* The sequential tracing token is a tuple of size 5: * |