diff options
| author | Rickard Green <[email protected]> | 2017-08-24 15:53:16 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-08-24 15:53:16 +0200 |
| commit | b93cc1dc4dadd109ef841b360d7baf99688ce918 (patch) | |
| tree | 78076d0a3a2fd3a86d1b8d011b9505bd035cd5dc /erts/emulator/beam | |
| parent | 9762af0851da245444173b22509462b90c7cc7c6 (diff) | |
| parent | 076167bae6cc57d188cdf59fd94c82f3a36ee7ee (diff) | |
| download | otp-b93cc1dc4dadd109ef841b360d7baf99688ce918.tar.gz otp-b93cc1dc4dadd109ef841b360d7baf99688ce918.tar.bz2 otp-b93cc1dc4dadd109ef841b360d7baf99688ce918.zip | |
Merge branch 'rickard/timer-sid-bug/OTP-14548' into maint
* rickard/timer-sid-bug/OTP-14548:
Fix scheduler id field in timers
Conflicts:
erts/emulator/beam/erl_hl_timer.c
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_hl_timer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c index 99995be464..af1cc6b933 100644 --- a/erts/emulator/beam/erl_hl_timer.c +++ b/erts/emulator/beam/erl_hl_timer.c @@ -103,14 +103,14 @@ 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) #define ERTS_TMR_ROFLG_SID_MASK \ (ERTS_TMR_ROFLG_HLT - (Uint32) 1) |