diff options
author | Lukas Larsson <[email protected]> | 2019-01-23 10:22:17 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2019-01-23 10:22:17 +0100 |
commit | aba6a2c2b5ae9dca21c5e14f5c25b175c6b67782 (patch) | |
tree | f8d2df95eed18df1a2402488fefd8aa10df9897f /erts/emulator/beam/erl_process.h | |
parent | 3aba68193ab414cd807fe0757a6b6f8f20bd57ef (diff) | |
parent | a53f58ff4fc68f069c395966a0b7375523c77b65 (diff) | |
download | otp-aba6a2c2b5ae9dca21c5e14f5c25b175c6b67782.tar.gz otp-aba6a2c2b5ae9dca21c5e14f5c25b175c6b67782.tar.bz2 otp-aba6a2c2b5ae9dca21c5e14f5c25b175c6b67782.zip |
Merge branch 'lukas/erts/scheduler-pollset-fixes/OTP-15538' into maint
* lukas/erts/scheduler-pollset-fixes/OTP-15538:
erts: Fix getting of poll events on linux >= 4.15.0
erts: Use reduction based polling for starved poll-set
erts: Fix pollset test cases
Diffstat (limited to 'erts/emulator/beam/erl_process.h')
-rw-r--r-- | erts/emulator/beam/erl_process.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 0aa19e7bde..43937f216c 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -173,8 +173,6 @@ extern int erts_dio_sched_thread_suggested_stack_size; (((Uint32) 1) << (ERTS_RUNQ_FLG_BASE2 + 9)) #define ERTS_RUNQ_FLG_HALTING \ (((Uint32) 1) << (ERTS_RUNQ_FLG_BASE2 + 10)) -#define ERTS_RUNQ_FLG_CHECKIO \ - (((Uint32) 1) << (ERTS_RUNQ_FLG_BASE2 + 11)) #define ERTS_RUNQ_FLG_MAX (ERTS_RUNQ_FLG_BASE2 + 12) |