aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-11-15 14:39:59 +0100
committerErlang/OTP <[email protected]>2017-11-15 14:39:59 +0100
commit24e0ec632a12f8f5ef2afc7cfc2118b7db6c1df9 (patch)
treeae88aee000f140bbe6a444ae290363a4205916fc
parent59de2ff0e39ca427aa8c075f127869fec7791dad (diff)
parent076167bae6cc57d188cdf59fd94c82f3a36ee7ee (diff)
downloadotp-24e0ec632a12f8f5ef2afc7cfc2118b7db6c1df9.tar.gz
otp-24e0ec632a12f8f5ef2afc7cfc2118b7db6c1df9.tar.bz2
otp-24e0ec632a12f8f5ef2afc7cfc2118b7db6c1df9.zip
Merge branch 'rickard/timer-sid-bug/OTP-14548' into maint-18
* rickard/timer-sid-bug/OTP-14548: Fix scheduler id field in timers
-rw-r--r--erts/emulator/beam/erl_hl_timer.c18
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 fbfde83dba..12007c4b83 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 \