diff options
| author | Erlang/OTP <[email protected]> | 2017-10-05 16:58:14 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-10-05 16:58:14 +0200 |
| commit | 567e5a7f9261d753a4b4f44706fea6400b8a855c (patch) | |
| tree | 452e5eea7b95142256d439f87d68fe250b7f63db | |
| parent | 74c9c2159b234317e5857de4f39318b50aa2d628 (diff) | |
| parent | 076167bae6cc57d188cdf59fd94c82f3a36ee7ee (diff) | |
| download | otp-567e5a7f9261d753a4b4f44706fea6400b8a855c.tar.gz otp-567e5a7f9261d753a4b4f44706fea6400b8a855c.tar.bz2 otp-567e5a7f9261d753a4b4f44706fea6400b8a855c.zip | |
Merge branch 'rickard/timer-sid-bug/OTP-14548' into maint-19
* rickard/timer-sid-bug/OTP-14548:
Fix scheduler id field in timers
| -rw-r--r-- | erts/emulator/beam/erl_hl_timer.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c index a73f4ecfc7..e9e1e502aa 100644 --- a/erts/emulator/beam/erl_hl_timer.c +++ b/erts/emulator/beam/erl_hl_timer.c @@ -98,16 +98,16 @@ typedef enum { # define ERTS_HLT_SMP_MEMBAR_LoadLoad_LoadStore #endif -/* Bit 0 to 9 contains scheduler id (see mask below) */ -#define ERTS_TMR_ROFLG_HLT (((Uint32) 1) << 10) -#define ERTS_TMR_ROFLG_BIF_TMR (((Uint32) 1) << 11) -#define ERTS_TMR_ROFLG_PRE_ALC (((Uint32) 1) << 12) -#define ERTS_TMR_ROFLG_REG_NAME (((Uint32) 1) << 13) -#define ERTS_TMR_ROFLG_PROC (((Uint32) 1) << 14) -#define ERTS_TMR_ROFLG_PORT (((Uint32) 1) << 15) -#define ERTS_TMR_ROFLG_CALLBACK (((Uint32) 1) << 16) +/* Bit 0 to 10 contains scheduler id (see mask below) */ +#define ERTS_TMR_ROFLG_HLT (((Uint32) 1) << 11) +#define ERTS_TMR_ROFLG_BIF_TMR (((Uint32) 1) << 12) +#define ERTS_TMR_ROFLG_PRE_ALC (((Uint32) 1) << 13) +#define ERTS_TMR_ROFLG_REG_NAME (((Uint32) 1) << 14) +#define ERTS_TMR_ROFLG_PROC (((Uint32) 1) << 15) +#define ERTS_TMR_ROFLG_PORT (((Uint32) 1) << 16) +#define ERTS_TMR_ROFLG_CALLBACK (((Uint32) 1) << 17) #ifdef ERTS_BTM_ACCESSOR_SUPPORT -#define ERTS_TMR_ROFLG_ABIF_TMR (((Uint32) 1) << 17) +#define ERTS_TMR_ROFLG_ABIF_TMR (((Uint32) 1) << 18) #endif #define ERTS_TMR_ROFLG_SID_MASK \ |