aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-08-24 15:55:13 +0200
committerRickard Green <[email protected]>2017-08-24 15:55:13 +0200
commit27058d210eb3b6bdfa697de6d18fd1623af32efb (patch)
tree1f070f53fa5461bab776d17dd32330568e7948de /erts/emulator
parent9bdd2e0fcbc0c9701dab05fed33aaef367c9500a (diff)
parentb93cc1dc4dadd109ef841b360d7baf99688ce918 (diff)
downloadotp-27058d210eb3b6bdfa697de6d18fd1623af32efb.tar.gz
otp-27058d210eb3b6bdfa697de6d18fd1623af32efb.tar.bz2
otp-27058d210eb3b6bdfa697de6d18fd1623af32efb.zip
Merge branch 'maint'
* maint: Fix scheduler id field in timers Conflicts: erts/emulator/beam/erl_hl_timer.c
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_hl_timer.c16
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 f8cbe6f49a..d61c1e5bbf 100644
--- a/erts/emulator/beam/erl_hl_timer.c
+++ b/erts/emulator/beam/erl_hl_timer.c
@@ -96,14 +96,14 @@ typedef enum {
#define ERTS_BIF_TIMER_SHORT_TIME 5000
-/* 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)