Merge branch 'lukas/erts/poll-thread/OTP-14346'

* lukas/erts/poll-thread/OTP-14346: (25 commits)
  erts: Trigger ready events when erts_io_control fails
  erts: enif_select steal test
  kernel: Rewrite gen_udp_SUITE:read_packet tc
  erts: disable kernel-poll on OS X vsn < 16
  erts: Fix msacc testcase with new poll-thread
  erts: Add testcases to test IOp and IOt options
  erts: get_internal_state(check_io_debug) now prints to error_logger
  erts: Remove eager check io
  erts: Move all I/O polling to a seperate thread
  erts: Fix smp_select testcase to use ERL_DRV_USE
  erts: Fix msacc unmanaged state counter
  erts: Optimize port_task quick allocator
  erts: Add ERTS_THR_PREF_QUICK_ALLOC_IMPL
  erts: Update suspend of scheduler to handle multiple pollsets
  erts: Add multiple poll sets
  erts: Some code cleanup for gdb to work better
  erts: temp_alloc can no longer be disabled
  erts: Refactor check_io to use one static struct
  erts: Replace check_io spinlock with lock-less list insertion
  erts: Add number of enif_select's to check_io_debug
  ...

1 files changed, 0 insertions, 22 deletions

diff --git a/erts/emulator/beam/erl_lock_count.c b/erts/emulator/beam/erl_lock_count.c
index d2e8f47d59..1ae6076b12 100644
--- a/erts/emulator/beam/erl_lock_count.c
+++ b/erts/emulator/beam/erl_lock_count.c
@@ -554,16 +554,6 @@ erts_lock_flags_t erts_lcnt_get_category_mask() {
     return lcnt_category_mask__;
 }
 
-#ifdef ERTS_ENABLE_KERNEL_POLL
-/* erl_poll/erl_check_io only exports one of these variants at a time, and we
- * may need to use either one depending on emulator startup flags. */
-void erts_lcnt_update_pollset_locks_nkp(int);
-void erts_lcnt_update_pollset_locks_kp(int);
-
-void erts_lcnt_update_cio_locks_nkp(int);
-void erts_lcnt_update_cio_locks_kp(int);
-#endif
-
 void erts_lcnt_set_category_mask(erts_lock_flags_t mask) {
     erts_lock_flags_t changed_categories;
 
@@ -590,19 +580,7 @@ void erts_lcnt_set_category_mask(erts_lock_flags_t mask) {
     }
 
     if(changed_categories & ERTS_LOCK_FLAGS_CATEGORY_IO) {
-#ifdef ERTS_ENABLE_KERNEL_POLL
-        if(erts_use_kernel_poll) {
-            erts_lcnt_update_pollset_locks_kp(mask & ERTS_LOCK_FLAGS_CATEGORY_IO);
-            erts_lcnt_update_cio_locks_kp(mask & ERTS_LOCK_FLAGS_CATEGORY_IO);
-        } else {
-            erts_lcnt_update_pollset_locks_nkp(mask & ERTS_LOCK_FLAGS_CATEGORY_IO);
-            erts_lcnt_update_cio_locks_nkp(mask & ERTS_LOCK_FLAGS_CATEGORY_IO);
-        }
-#else
-        erts_lcnt_update_pollset_locks(mask & ERTS_LOCK_FLAGS_CATEGORY_IO);
         erts_lcnt_update_cio_locks(mask & ERTS_LOCK_FLAGS_CATEGORY_IO);
-#endif
-
         erts_lcnt_update_driver_locks(mask & ERTS_LOCK_FLAGS_CATEGORY_IO);
         erts_lcnt_update_port_locks(mask & ERTS_LOCK_FLAGS_CATEGORY_IO);
     }