netbsd.diff

diff --git a/lib/libtsan/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc b/lib/libtsan/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
index 16b2a10d8b..6370e63ab6 100644
--- a/lib/libtsan/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
+++ b/lib/libtsan/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
@@ -641,22 +641,6 @@ static void ioctl_table_fill() {
   _(SPKRSETVOL, READ, sizeof(unsigned int));
 #if defined(__x86_64__)
   /* Entries from file: dev/nvmm/nvmm_ioctl.h */
-  _(NVMM_IOC_CAPABILITY, WRITE, struct_nvmm_ioc_capability_sz);
-  _(NVMM_IOC_MACHINE_CREATE, READWRITE, struct_nvmm_ioc_machine_create_sz);
-  _(NVMM_IOC_MACHINE_DESTROY, READ, struct_nvmm_ioc_machine_destroy_sz);
-  _(NVMM_IOC_MACHINE_CONFIGURE, READ, struct_nvmm_ioc_machine_configure_sz);
-  _(NVMM_IOC_VCPU_CREATE, READ, struct_nvmm_ioc_vcpu_create_sz);
-  _(NVMM_IOC_VCPU_DESTROY, READ, struct_nvmm_ioc_vcpu_destroy_sz);
-  _(NVMM_IOC_VCPU_CONFIGURE, READ, struct_nvmm_ioc_vcpu_configure_sz);
-  _(NVMM_IOC_VCPU_SETSTATE, READ, struct_nvmm_ioc_vcpu_setstate_sz);
-  _(NVMM_IOC_VCPU_GETSTATE, READ, struct_nvmm_ioc_vcpu_getstate_sz);
-  _(NVMM_IOC_VCPU_INJECT, READ, struct_nvmm_ioc_vcpu_inject_sz);
-  _(NVMM_IOC_VCPU_RUN, READWRITE, struct_nvmm_ioc_vcpu_run_sz);
-  _(NVMM_IOC_GPA_MAP, READ, struct_nvmm_ioc_gpa_map_sz);
-  _(NVMM_IOC_GPA_UNMAP, READ, struct_nvmm_ioc_gpa_unmap_sz);
-  _(NVMM_IOC_HVA_MAP, READ, struct_nvmm_ioc_hva_map_sz);
-  _(NVMM_IOC_HVA_UNMAP, READ, struct_nvmm_ioc_hva_unmap_sz);
-  _(NVMM_IOC_CTL, READ, struct_nvmm_ioc_ctl_sz);
 #endif
   /* Entries from file: dev/spi/spi_io.h */
   _(SPI_IOCTL_CONFIGURE, READ, struct_spi_ioctl_configure_sz);
@@ -878,29 +862,6 @@ static void ioctl_table_fill() {
   _(AGPIOC_BIND, READ, struct__agp_bind_sz);
   _(AGPIOC_UNBIND, READ, struct__agp_unbind_sz);
   /* Entries from file: sys/audioio.h */
-  _(AUDIO_GETINFO, WRITE, struct_audio_info_sz);
-  _(AUDIO_SETINFO, READWRITE, struct_audio_info_sz);
-  _(AUDIO_DRAIN, NONE, 0);
-  _(AUDIO_FLUSH, NONE, 0);
-  _(AUDIO_WSEEK, WRITE, sizeof(unsigned long));
-  _(AUDIO_RERROR, WRITE, sizeof(int));
-  _(AUDIO_GETDEV, WRITE, struct_audio_device_sz);
-  _(AUDIO_GETENC, READWRITE, struct_audio_encoding_sz);
-  _(AUDIO_GETFD, WRITE, sizeof(int));
-  _(AUDIO_SETFD, READWRITE, sizeof(int));
-  _(AUDIO_PERROR, WRITE, sizeof(int));
-  _(AUDIO_GETIOFFS, WRITE, struct_audio_offset_sz);
-  _(AUDIO_GETOOFFS, WRITE, struct_audio_offset_sz);
-  _(AUDIO_GETPROPS, WRITE, sizeof(int));
-  _(AUDIO_GETBUFINFO, WRITE, struct_audio_info_sz);
-  _(AUDIO_SETCHAN, READ, sizeof(int));
-  _(AUDIO_GETCHAN, WRITE, sizeof(int));
-  _(AUDIO_QUERYFORMAT, READWRITE, struct_audio_format_query_sz);
-  _(AUDIO_GETFORMAT, WRITE, struct_audio_info_sz);
-  _(AUDIO_SETFORMAT, READ, struct_audio_info_sz);
-  _(AUDIO_MIXER_READ, READWRITE, struct_mixer_ctrl_sz);
-  _(AUDIO_MIXER_WRITE, READWRITE, struct_mixer_ctrl_sz);
-  _(AUDIO_MIXER_DEVINFO, READWRITE, struct_mixer_devinfo_sz);
   /* Entries from file: sys/ataio.h */
   _(ATAIOCCOMMAND, READWRITE, struct_atareq_sz);
   _(ATABUSIOSCAN, READ, struct_atabusioscan_args_sz);
@@ -1071,11 +1032,6 @@ static void ioctl_table_fill() {
   _(KIOCGVALUE, READWRITE, struct_ksyms_gvalue_sz);
   _(KIOCGSYMBOL, READWRITE, struct_ksyms_gsymbol_sz);
   /* Entries from file: sys/lua.h */
-  _(LUAINFO, READWRITE, struct_lua_info_sz);
-  _(LUACREATE, READWRITE, struct_lua_create_sz);
-  _(LUADESTROY, READWRITE, struct_lua_create_sz);
-  _(LUAREQUIRE, READWRITE, struct_lua_require_sz);
-  _(LUALOAD, READWRITE, struct_lua_load_sz);
   /* Entries from file: sys/midiio.h */
   _(MIDI_PRETIME, READWRITE, sizeof(int));
   _(MIDI_MPUMODE, READWRITE, sizeof(int));
@@ -1355,48 +1311,6 @@ static void ioctl_table_fill() {
   _(IPMICTL_SET_MY_LUN_CMD, READ, sizeof(unsigned int));
   _(IPMICTL_GET_MY_LUN_CMD, WRITE, sizeof(unsigned int));
   /* Entries from file: soundcard.h */
-  _(SNDCTL_DSP_RESET, NONE, 0);
-  _(SNDCTL_DSP_SYNC, NONE, 0);
-  _(SNDCTL_DSP_SPEED, READWRITE, sizeof(int));
-  _(SOUND_PCM_READ_RATE, WRITE, sizeof(int));
-  _(SNDCTL_DSP_STEREO, READWRITE, sizeof(int));
-  _(SNDCTL_DSP_GETBLKSIZE, READWRITE, sizeof(int));
-  _(SNDCTL_DSP_SETFMT, READWRITE, sizeof(int));
-  _(SOUND_PCM_READ_BITS, WRITE, sizeof(int));
-  _(SNDCTL_DSP_CHANNELS, READWRITE, sizeof(int));
-  _(SOUND_PCM_READ_CHANNELS, WRITE, sizeof(int));
-  _(SOUND_PCM_WRITE_FILTER, READWRITE, sizeof(int));
-  _(SOUND_PCM_READ_FILTER, WRITE, sizeof(int));
-  _(SNDCTL_DSP_POST, NONE, 0);
-  _(SNDCTL_DSP_SUBDIVIDE, READWRITE, sizeof(int));
-  _(SNDCTL_DSP_SETFRAGMENT, READWRITE, sizeof(int));
-  _(SNDCTL_DSP_GETFMTS, WRITE, sizeof(int));
-  _(SNDCTL_DSP_GETOSPACE, WRITE, struct_audio_buf_info_sz);
-  _(SNDCTL_DSP_GETISPACE, WRITE, struct_audio_buf_info_sz);
-  _(SNDCTL_DSP_NONBLOCK, NONE, 0);
-  _(SNDCTL_DSP_GETCAPS, WRITE, sizeof(int));
-  _(SNDCTL_DSP_GETTRIGGER, WRITE, sizeof(int));
-  _(SNDCTL_DSP_SETTRIGGER, READ, sizeof(int));
-  _(SNDCTL_DSP_GETIPTR, WRITE, struct_count_info_sz);
-  _(SNDCTL_DSP_GETOPTR, WRITE, struct_count_info_sz);
-  _(SNDCTL_DSP_MAPINBUF, WRITE, struct_buffmem_desc_sz);
-  _(SNDCTL_DSP_MAPOUTBUF, WRITE, struct_buffmem_desc_sz);
-  _(SNDCTL_DSP_SETSYNCRO, NONE, 0);
-  _(SNDCTL_DSP_SETDUPLEX, NONE, 0);
-  _(SNDCTL_DSP_PROFILE, READ, sizeof(int));
-  _(SNDCTL_DSP_GETODELAY, WRITE, sizeof(int));
-  _(SOUND_MIXER_INFO, WRITE, struct_mixer_info_sz);
-  _(SOUND_OLD_MIXER_INFO, WRITE, struct__old_mixer_info_sz);
-  _(OSS_GETVERSION, WRITE, sizeof(int));
-  _(SNDCTL_SYSINFO, WRITE, struct_oss_sysinfo_sz);
-  _(SNDCTL_AUDIOINFO, READWRITE, struct_oss_audioinfo_sz);
-  _(SNDCTL_ENGINEINFO, READWRITE, struct_oss_audioinfo_sz);
-  _(SNDCTL_DSP_GETPLAYVOL, WRITE, sizeof(unsigned int));
-  _(SNDCTL_DSP_SETPLAYVOL, READ, sizeof(unsigned int));
-  _(SNDCTL_DSP_GETRECVOL, WRITE, sizeof(unsigned int));
-  _(SNDCTL_DSP_SETRECVOL, READ, sizeof(unsigned int));
-  _(SNDCTL_DSP_SKIP, NONE, 0);
-  _(SNDCTL_DSP_SILENCE, NONE, 0);
   /* Entries from file: dev/filemon/filemon.h (compat <= 9.99.26) */
   _(FILEMON_SET_FD, READWRITE, sizeof(int));
   _(FILEMON_SET_PID, READWRITE, sizeof(int));
diff --git a/lib/libtsan/sanitizer_common/sanitizer_platform_limits_netbsd.cpp b/lib/libtsan/sanitizer_common/sanitizer_platform_limits_netbsd.cpp
index aacd28c55c..1b9144a3dc 100644
--- a/lib/libtsan/sanitizer_common/sanitizer_platform_limits_netbsd.cpp
+++ b/lib/libtsan/sanitizer_common/sanitizer_platform_limits_netbsd.cpp
@@ -47,7 +47,7 @@
 #include <sys/ioctl_compat.h>
 #include <sys/joystick.h>
 #include <sys/ksyms.h>
-#include <sys/lua.h>
+// #include <sys/lua.h>
 #include <sys/midiio.h>
 #include <sys/mtio.h>
 #include <sys/power.h>
@@ -91,7 +91,7 @@
 #include <sys/signal.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <sys/soundcard.h>
+// #include <sys/soundcard.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/time.h>
@@ -497,8 +497,8 @@ struct urio_command {
 #include <md4.h>
 #include <md5.h>
 #include <rmd160.h>
-#include <soundcard.h>
-#include <term.h>
+// #include <soundcard.h>
+// #include <term.h>
 #include <termios.h>
 #include <time.h>
 #include <ttyent.h>
@@ -515,7 +515,7 @@ struct urio_command {
 #include <stringlist.h>
 
 #if defined(__x86_64__)
-#include <nvmm.h>
+// #include <nvmm.h>
 #endif
 // clang-format on
 
@@ -692,11 +692,11 @@ unsigned struct_atabusiodetach_args_sz = sizeof(atabusiodetach_args);
 unsigned struct_atabusioscan_args_sz = sizeof(atabusioscan_args);
 unsigned struct_ath_diag_sz = sizeof(ath_diag);
 unsigned struct_atm_flowmap_sz = sizeof(atm_flowmap);
-unsigned struct_audio_buf_info_sz = sizeof(audio_buf_info);
-unsigned struct_audio_device_sz = sizeof(audio_device);
-unsigned struct_audio_encoding_sz = sizeof(audio_encoding);
-unsigned struct_audio_info_sz = sizeof(audio_info);
-unsigned struct_audio_offset_sz = sizeof(audio_offset);
+// unsigned struct_audio_buf_info_sz = sizeof(audio_buf_info);
+// unsigned struct_audio_device_sz = sizeof(audio_device);
+// unsigned struct_audio_encoding_sz = sizeof(audio_encoding);
+// unsigned struct_audio_info_sz = sizeof(audio_info);
+// unsigned struct_audio_offset_sz = sizeof(audio_offset);
 unsigned struct_bio_locate_sz = sizeof(bio_locate);
 unsigned struct_bioc_alarm_sz = sizeof(bioc_alarm);
 unsigned struct_bioc_blink_sz = sizeof(bioc_blink);
@@ -717,7 +717,7 @@ unsigned struct_bpf_stat_sz = sizeof(bpf_stat);
 unsigned struct_bpf_version_sz = sizeof(bpf_version);
 unsigned struct_btreq_sz = sizeof(btreq);
 unsigned struct_btsco_info_sz = sizeof(btsco_info);
-unsigned struct_buffmem_desc_sz = sizeof(buffmem_desc);
+// unsigned struct_buffmem_desc_sz = sizeof(buffmem_desc);
 unsigned struct_cbq_add_class_sz = sizeof(cbq_add_class);
 unsigned struct_cbq_add_filter_sz = sizeof(cbq_add_filter);
 unsigned struct_cbq_delete_class_sz = sizeof(cbq_delete_class);
@@ -757,7 +757,7 @@ unsigned struct_clockctl_settimeofday_sz = sizeof(clockctl_settimeofday);
 unsigned struct_cnwistats_sz = sizeof(cnwistats);
 unsigned struct_cnwitrail_sz = sizeof(cnwitrail);
 unsigned struct_cnwstatus_sz = sizeof(cnwstatus);
-unsigned struct_count_info_sz = sizeof(count_info);
+// unsigned struct_count_info_sz = sizeof(count_info);
 unsigned struct_cpu_ucode_sz = sizeof(cpu_ucode);
 unsigned struct_cpu_ucode_version_sz = sizeof(cpu_ucode_version);
 unsigned struct_crypt_kop_sz = sizeof(crypt_kop);
@@ -866,10 +866,10 @@ unsigned struct_ksyms_gvalue_sz = sizeof(ksyms_gvalue);
 unsigned struct_ksyms_ogsymbol_sz = sizeof(ksyms_ogsymbol);
 unsigned struct_kttcp_io_args_sz = sizeof(kttcp_io_args);
 unsigned struct_ltchars_sz = sizeof(ltchars);
-unsigned struct_lua_create_sz = sizeof(struct lua_create);
-unsigned struct_lua_info_sz = sizeof(struct lua_info);
-unsigned struct_lua_load_sz = sizeof(struct lua_load);
-unsigned struct_lua_require_sz = sizeof(lua_require);
+// unsigned struct_lua_create_sz = sizeof(struct lua_create);
+// unsigned struct_lua_info_sz = sizeof(struct lua_info);
+// unsigned struct_lua_load_sz = sizeof(struct lua_load);
+// unsigned struct_lua_require_sz = sizeof(lua_require);
 unsigned struct_mbpp_param_sz = sizeof(mbpp_param);
 unsigned struct_md_conf_sz = sizeof(md_conf);
 unsigned struct_meteor_capframe_sz = sizeof(meteor_capframe);
@@ -895,8 +895,8 @@ unsigned struct_ofiocdesc_sz = sizeof(ofiocdesc);
 unsigned struct_okiockey_sz = sizeof(okiockey);
 unsigned struct_ortentry_sz = sizeof(ortentry);
 unsigned struct_oscsi_addr_sz = sizeof(oscsi_addr);
-unsigned struct_oss_audioinfo_sz = sizeof(oss_audioinfo);
-unsigned struct_oss_sysinfo_sz = sizeof(oss_sysinfo);
+// unsigned struct_oss_audioinfo_sz = sizeof(oss_audioinfo);
+// unsigned struct_oss_sysinfo_sz = sizeof(oss_sysinfo);
 unsigned struct_pciio_bdf_cfgreg_sz = sizeof(pciio_bdf_cfgreg);
 unsigned struct_pciio_businfo_sz = sizeof(pciio_businfo);
 unsigned struct_pciio_cfgreg_sz = sizeof(pciio_cfgreg);
@@ -996,23 +996,23 @@ unsigned struct_usb_ctl_report_desc_sz = sizeof(usb_ctl_report_desc);
 unsigned struct_usb_ctl_report_sz = sizeof(usb_ctl_report);
 unsigned struct_usb_ctl_request_sz = sizeof(usb_ctl_request);
 #if defined(__x86_64__)
-unsigned struct_nvmm_ioc_capability_sz = sizeof(nvmm_ioc_capability);
-unsigned struct_nvmm_ioc_machine_create_sz = sizeof(nvmm_ioc_machine_create);
-unsigned struct_nvmm_ioc_machine_destroy_sz = sizeof(nvmm_ioc_machine_destroy);
-unsigned struct_nvmm_ioc_machine_configure_sz =
-    sizeof(nvmm_ioc_machine_configure);
-unsigned struct_nvmm_ioc_vcpu_create_sz = sizeof(nvmm_ioc_vcpu_create);
-unsigned struct_nvmm_ioc_vcpu_destroy_sz = sizeof(nvmm_ioc_vcpu_destroy);
-unsigned struct_nvmm_ioc_vcpu_configure_sz = sizeof(nvmm_ioc_vcpu_configure);
-unsigned struct_nvmm_ioc_vcpu_setstate_sz = sizeof(nvmm_ioc_vcpu_destroy);
-unsigned struct_nvmm_ioc_vcpu_getstate_sz = sizeof(nvmm_ioc_vcpu_getstate);
-unsigned struct_nvmm_ioc_vcpu_inject_sz = sizeof(nvmm_ioc_vcpu_inject);
-unsigned struct_nvmm_ioc_vcpu_run_sz = sizeof(nvmm_ioc_vcpu_run);
-unsigned struct_nvmm_ioc_gpa_map_sz = sizeof(nvmm_ioc_gpa_map);
-unsigned struct_nvmm_ioc_gpa_unmap_sz = sizeof(nvmm_ioc_gpa_unmap);
-unsigned struct_nvmm_ioc_hva_map_sz = sizeof(nvmm_ioc_hva_map);
-unsigned struct_nvmm_ioc_hva_unmap_sz = sizeof(nvmm_ioc_hva_unmap);
-unsigned struct_nvmm_ioc_ctl_sz = sizeof(nvmm_ioc_ctl);
+// unsigned struct_nvmm_ioc_capability_sz = sizeof(nvmm_ioc_capability);
+// unsigned struct_nvmm_ioc_machine_create_sz = sizeof(nvmm_ioc_machine_create);
+// unsigned struct_nvmm_ioc_machine_destroy_sz = sizeof(nvmm_ioc_machine_destroy);
+// unsigned struct_nvmm_ioc_machine_configure_sz =
+//     sizeof(nvmm_ioc_machine_configure);
+// unsigned struct_nvmm_ioc_vcpu_create_sz = sizeof(nvmm_ioc_vcpu_create);
+// unsigned struct_nvmm_ioc_vcpu_destroy_sz = sizeof(nvmm_ioc_vcpu_destroy);
+// unsigned struct_nvmm_ioc_vcpu_configure_sz = sizeof(nvmm_ioc_vcpu_configure);
+// unsigned struct_nvmm_ioc_vcpu_setstate_sz = sizeof(nvmm_ioc_vcpu_destroy);
+// unsigned struct_nvmm_ioc_vcpu_getstate_sz = sizeof(nvmm_ioc_vcpu_getstate);
+// unsigned struct_nvmm_ioc_vcpu_inject_sz = sizeof(nvmm_ioc_vcpu_inject);
+// unsigned struct_nvmm_ioc_vcpu_run_sz = sizeof(nvmm_ioc_vcpu_run);
+// unsigned struct_nvmm_ioc_gpa_map_sz = sizeof(nvmm_ioc_gpa_map);
+// unsigned struct_nvmm_ioc_gpa_unmap_sz = sizeof(nvmm_ioc_gpa_unmap);
+// unsigned struct_nvmm_ioc_hva_map_sz = sizeof(nvmm_ioc_hva_map);
+// unsigned struct_nvmm_ioc_hva_unmap_sz = sizeof(nvmm_ioc_hva_unmap);
+// unsigned struct_nvmm_ioc_ctl_sz = sizeof(nvmm_ioc_ctl);
 #endif
 unsigned struct_spi_ioctl_configure_sz = sizeof(spi_ioctl_configure);
 unsigned struct_spi_ioctl_transfer_sz = sizeof(spi_ioctl_transfer);
@@ -1101,7 +1101,7 @@ unsigned struct_tone_sz = sizeof(tone_t);
 unsigned union_twe_statrequest_sz = sizeof(union twe_statrequest);
 unsigned struct_usb_device_descriptor_sz = sizeof(usb_device_descriptor_t);
 unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
-unsigned struct__old_mixer_info_sz = sizeof(struct _old_mixer_info);
+// unsigned struct__old_mixer_info_sz = sizeof(struct _old_mixer_info);
 unsigned struct__agp_allocate_sz = sizeof(struct _agp_allocate);
 unsigned struct__agp_bind_sz = sizeof(struct _agp_bind);
 unsigned struct__agp_info_sz = sizeof(struct _agp_info);
@@ -1159,7 +1159,7 @@ unsigned struct_rndstat_est_sz = sizeof(rndstat_est_t);
 unsigned struct_rndstat_est_name_sz = sizeof(rndstat_est_name_t);
 unsigned struct_pps_params_sz = sizeof(pps_params_t);
 unsigned struct_pps_info_sz = sizeof(pps_info_t);
-unsigned struct_mixer_info_sz = sizeof(struct mixer_info);
+// unsigned struct_mixer_info_sz = sizeof(struct mixer_info);
 unsigned struct_RF_SparetWait_sz = sizeof(RF_SparetWait_t);
 unsigned struct_RF_ComponentLabel_sz = sizeof(RF_ComponentLabel_t);
 unsigned struct_RF_SingleComponent_sz = sizeof(RF_SingleComponent_t);
@@ -1758,22 +1758,22 @@ unsigned IOCTL_SPKRTUNE = SPKRTUNE;
 unsigned IOCTL_SPKRGETVOL = SPKRGETVOL;
 unsigned IOCTL_SPKRSETVOL = SPKRSETVOL;
 #if defined(__x86_64__)
-unsigned IOCTL_NVMM_IOC_CAPABILITY = NVMM_IOC_CAPABILITY;
-unsigned IOCTL_NVMM_IOC_MACHINE_CREATE = NVMM_IOC_MACHINE_CREATE;
-unsigned IOCTL_NVMM_IOC_MACHINE_DESTROY = NVMM_IOC_MACHINE_DESTROY;
-unsigned IOCTL_NVMM_IOC_MACHINE_CONFIGURE = NVMM_IOC_MACHINE_CONFIGURE;
-unsigned IOCTL_NVMM_IOC_VCPU_CREATE = NVMM_IOC_VCPU_CREATE;
-unsigned IOCTL_NVMM_IOC_VCPU_DESTROY = NVMM_IOC_VCPU_DESTROY;
-unsigned IOCTL_NVMM_IOC_VCPU_CONFIGURE = NVMM_IOC_VCPU_CONFIGURE;
-unsigned IOCTL_NVMM_IOC_VCPU_SETSTATE = NVMM_IOC_VCPU_SETSTATE;
-unsigned IOCTL_NVMM_IOC_VCPU_GETSTATE = NVMM_IOC_VCPU_GETSTATE;
-unsigned IOCTL_NVMM_IOC_VCPU_INJECT = NVMM_IOC_VCPU_INJECT;
-unsigned IOCTL_NVMM_IOC_VCPU_RUN = NVMM_IOC_VCPU_RUN;
-unsigned IOCTL_NVMM_IOC_GPA_MAP = NVMM_IOC_GPA_MAP;
-unsigned IOCTL_NVMM_IOC_GPA_UNMAP = NVMM_IOC_GPA_UNMAP;
-unsigned IOCTL_NVMM_IOC_HVA_MAP = NVMM_IOC_HVA_MAP;
-unsigned IOCTL_NVMM_IOC_HVA_UNMAP = NVMM_IOC_HVA_UNMAP;
-unsigned IOCTL_NVMM_IOC_CTL = NVMM_IOC_CTL;
+// unsigned IOCTL_NVMM_IOC_CAPABILITY = NVMM_IOC_CAPABILITY;
+// unsigned IOCTL_NVMM_IOC_MACHINE_CREATE = NVMM_IOC_MACHINE_CREATE;
+// unsigned IOCTL_NVMM_IOC_MACHINE_DESTROY = NVMM_IOC_MACHINE_DESTROY;
+// unsigned IOCTL_NVMM_IOC_MACHINE_CONFIGURE = NVMM_IOC_MACHINE_CONFIGURE;
+// unsigned IOCTL_NVMM_IOC_VCPU_CREATE = NVMM_IOC_VCPU_CREATE;
+// unsigned IOCTL_NVMM_IOC_VCPU_DESTROY = NVMM_IOC_VCPU_DESTROY;
+// unsigned IOCTL_NVMM_IOC_VCPU_CONFIGURE = NVMM_IOC_VCPU_CONFIGURE;
+// unsigned IOCTL_NVMM_IOC_VCPU_SETSTATE = NVMM_IOC_VCPU_SETSTATE;
+// unsigned IOCTL_NVMM_IOC_VCPU_GETSTATE = NVMM_IOC_VCPU_GETSTATE;
+// unsigned IOCTL_NVMM_IOC_VCPU_INJECT = NVMM_IOC_VCPU_INJECT;
+// unsigned IOCTL_NVMM_IOC_VCPU_RUN = NVMM_IOC_VCPU_RUN;
+// unsigned IOCTL_NVMM_IOC_GPA_MAP = NVMM_IOC_GPA_MAP;
+// unsigned IOCTL_NVMM_IOC_GPA_UNMAP = NVMM_IOC_GPA_UNMAP;
+// unsigned IOCTL_NVMM_IOC_HVA_MAP = NVMM_IOC_HVA_MAP;
+// unsigned IOCTL_NVMM_IOC_HVA_UNMAP = NVMM_IOC_HVA_UNMAP;
+// unsigned IOCTL_NVMM_IOC_CTL = NVMM_IOC_CTL;
 #endif
 unsigned IOCTL_SPI_IOCTL_CONFIGURE = SPI_IOCTL_CONFIGURE;
 unsigned IOCTL_SPI_IOCTL_TRANSFER = SPI_IOCTL_TRANSFER;
@@ -2155,11 +2155,11 @@ unsigned IOCTL_OKIOCGVALUE = OKIOCGVALUE;
 unsigned IOCTL_KIOCGSIZE = KIOCGSIZE;
 unsigned IOCTL_KIOCGVALUE = KIOCGVALUE;
 unsigned IOCTL_KIOCGSYMBOL = KIOCGSYMBOL;
-unsigned IOCTL_LUAINFO = LUAINFO;
-unsigned IOCTL_LUACREATE = LUACREATE;
-unsigned IOCTL_LUADESTROY = LUADESTROY;
-unsigned IOCTL_LUAREQUIRE = LUAREQUIRE;
-unsigned IOCTL_LUALOAD = LUALOAD;
+// unsigned IOCTL_LUAINFO = LUAINFO;
+// unsigned IOCTL_LUACREATE = LUACREATE;
+// unsigned IOCTL_LUADESTROY = LUADESTROY;
+// unsigned IOCTL_LUAREQUIRE = LUAREQUIRE;
+// unsigned IOCTL_LUALOAD = LUALOAD;
 unsigned IOCTL_MIDI_PRETIME = MIDI_PRETIME;
 unsigned IOCTL_MIDI_MPUMODE = MIDI_MPUMODE;
 unsigned IOCTL_MIDI_MPUCMD = MIDI_MPUCMD;
@@ -2425,48 +2425,48 @@ unsigned IOCTL_IPMICTL_SET_MY_ADDRESS_CMD = IPMICTL_SET_MY_ADDRESS_CMD;
 unsigned IOCTL_IPMICTL_GET_MY_ADDRESS_CMD = IPMICTL_GET_MY_ADDRESS_CMD;
 unsigned IOCTL_IPMICTL_SET_MY_LUN_CMD = IPMICTL_SET_MY_LUN_CMD;
 unsigned IOCTL_IPMICTL_GET_MY_LUN_CMD = IPMICTL_GET_MY_LUN_CMD;
-unsigned IOCTL_SNDCTL_DSP_RESET = SNDCTL_DSP_RESET;
-unsigned IOCTL_SNDCTL_DSP_SYNC = SNDCTL_DSP_SYNC;
-unsigned IOCTL_SNDCTL_DSP_SPEED = SNDCTL_DSP_SPEED;
-unsigned IOCTL_SOUND_PCM_READ_RATE = SOUND_PCM_READ_RATE;
-unsigned IOCTL_SNDCTL_DSP_STEREO = SNDCTL_DSP_STEREO;
-unsigned IOCTL_SNDCTL_DSP_GETBLKSIZE = SNDCTL_DSP_GETBLKSIZE;
-unsigned IOCTL_SNDCTL_DSP_SETFMT = SNDCTL_DSP_SETFMT;
-unsigned IOCTL_SOUND_PCM_READ_BITS = SOUND_PCM_READ_BITS;
-unsigned IOCTL_SNDCTL_DSP_CHANNELS = SNDCTL_DSP_CHANNELS;
-unsigned IOCTL_SOUND_PCM_READ_CHANNELS = SOUND_PCM_READ_CHANNELS;
-unsigned IOCTL_SOUND_PCM_WRITE_FILTER = SOUND_PCM_WRITE_FILTER;
-unsigned IOCTL_SOUND_PCM_READ_FILTER = SOUND_PCM_READ_FILTER;
-unsigned IOCTL_SNDCTL_DSP_POST = SNDCTL_DSP_POST;
-unsigned IOCTL_SNDCTL_DSP_SUBDIVIDE = SNDCTL_DSP_SUBDIVIDE;
-unsigned IOCTL_SNDCTL_DSP_SETFRAGMENT = SNDCTL_DSP_SETFRAGMENT;
-unsigned IOCTL_SNDCTL_DSP_GETFMTS = SNDCTL_DSP_GETFMTS;
-unsigned IOCTL_SNDCTL_DSP_GETOSPACE = SNDCTL_DSP_GETOSPACE;
-unsigned IOCTL_SNDCTL_DSP_GETISPACE = SNDCTL_DSP_GETISPACE;
-unsigned IOCTL_SNDCTL_DSP_NONBLOCK = SNDCTL_DSP_NONBLOCK;
-unsigned IOCTL_SNDCTL_DSP_GETCAPS = SNDCTL_DSP_GETCAPS;
-unsigned IOCTL_SNDCTL_DSP_GETTRIGGER = SNDCTL_DSP_GETTRIGGER;
-unsigned IOCTL_SNDCTL_DSP_SETTRIGGER = SNDCTL_DSP_SETTRIGGER;
-unsigned IOCTL_SNDCTL_DSP_GETIPTR = SNDCTL_DSP_GETIPTR;
-unsigned IOCTL_SNDCTL_DSP_GETOPTR = SNDCTL_DSP_GETOPTR;
-unsigned IOCTL_SNDCTL_DSP_MAPINBUF = SNDCTL_DSP_MAPINBUF;
-unsigned IOCTL_SNDCTL_DSP_MAPOUTBUF = SNDCTL_DSP_MAPOUTBUF;
-unsigned IOCTL_SNDCTL_DSP_SETSYNCRO = SNDCTL_DSP_SETSYNCRO;
-unsigned IOCTL_SNDCTL_DSP_SETDUPLEX = SNDCTL_DSP_SETDUPLEX;
-unsigned IOCTL_SNDCTL_DSP_PROFILE = SNDCTL_DSP_PROFILE;
-unsigned IOCTL_SNDCTL_DSP_GETODELAY = SNDCTL_DSP_GETODELAY;
-unsigned IOCTL_SOUND_MIXER_INFO = SOUND_MIXER_INFO;
-unsigned IOCTL_SOUND_OLD_MIXER_INFO = SOUND_OLD_MIXER_INFO;
-unsigned IOCTL_OSS_GETVERSION = OSS_GETVERSION;
-unsigned IOCTL_SNDCTL_SYSINFO = SNDCTL_SYSINFO;
-unsigned IOCTL_SNDCTL_AUDIOINFO = SNDCTL_AUDIOINFO;
-unsigned IOCTL_SNDCTL_ENGINEINFO = SNDCTL_ENGINEINFO;
-unsigned IOCTL_SNDCTL_DSP_GETPLAYVOL = SNDCTL_DSP_GETPLAYVOL;
-unsigned IOCTL_SNDCTL_DSP_SETPLAYVOL = SNDCTL_DSP_SETPLAYVOL;
-unsigned IOCTL_SNDCTL_DSP_GETRECVOL = SNDCTL_DSP_GETRECVOL;
-unsigned IOCTL_SNDCTL_DSP_SETRECVOL = SNDCTL_DSP_SETRECVOL;
-unsigned IOCTL_SNDCTL_DSP_SKIP = SNDCTL_DSP_SKIP;
-unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDCTL_DSP_SILENCE;
+// unsigned IOCTL_SNDCTL_DSP_RESET = SNDCTL_DSP_RESET;
+// unsigned IOCTL_SNDCTL_DSP_SYNC = SNDCTL_DSP_SYNC;
+// unsigned IOCTL_SNDCTL_DSP_SPEED = SNDCTL_DSP_SPEED;
+// unsigned IOCTL_SOUND_PCM_READ_RATE = SOUND_PCM_READ_RATE;
+// unsigned IOCTL_SNDCTL_DSP_STEREO = SNDCTL_DSP_STEREO;
+// unsigned IOCTL_SNDCTL_DSP_GETBLKSIZE = SNDCTL_DSP_GETBLKSIZE;
+// unsigned IOCTL_SNDCTL_DSP_SETFMT = SNDCTL_DSP_SETFMT;
+// // unsigned IOCTL_SOUND_PCM_READ_BITS = SOUND_PCM_READ_BITS;
+// unsigned IOCTL_SNDCTL_DSP_CHANNELS = SNDCTL_DSP_CHANNELS;
+// // unsigned IOCTL_SOUND_PCM_READ_CHANNELS = SOUND_PCM_READ_CHANNELS;
+// // unsigned IOCTL_SOUND_PCM_WRITE_FILTER = SOUND_PCM_WRITE_FILTER;
+// // unsigned IOCTL_SOUND_PCM_READ_FILTER = SOUND_PCM_READ_FILTER;
+// unsigned IOCTL_SNDCTL_DSP_POST = SNDCTL_DSP_POST;
+// unsigned IOCTL_SNDCTL_DSP_SUBDIVIDE = SNDCTL_DSP_SUBDIVIDE;
+// unsigned IOCTL_SNDCTL_DSP_SETFRAGMENT = SNDCTL_DSP_SETFRAGMENT;
+// unsigned IOCTL_SNDCTL_DSP_GETFMTS = SNDCTL_DSP_GETFMTS;
+// unsigned IOCTL_SNDCTL_DSP_GETOSPACE = SNDCTL_DSP_GETOSPACE;
+// unsigned IOCTL_SNDCTL_DSP_GETISPACE = SNDCTL_DSP_GETISPACE;
+// unsigned IOCTL_SNDCTL_DSP_NONBLOCK = SNDCTL_DSP_NONBLOCK;
+// unsigned IOCTL_SNDCTL_DSP_GETCAPS = SNDCTL_DSP_GETCAPS;
+// unsigned IOCTL_SNDCTL_DSP_GETTRIGGER = SNDCTL_DSP_GETTRIGGER;
+// unsigned IOCTL_SNDCTL_DSP_SETTRIGGER = SNDCTL_DSP_SETTRIGGER;
+// unsigned IOCTL_SNDCTL_DSP_GETIPTR = SNDCTL_DSP_GETIPTR;
+// unsigned IOCTL_SNDCTL_DSP_GETOPTR = SNDCTL_DSP_GETOPTR;
+// unsigned IOCTL_SNDCTL_DSP_MAPINBUF = SNDCTL_DSP_MAPINBUF;
+// unsigned IOCTL_SNDCTL_DSP_MAPOUTBUF = SNDCTL_DSP_MAPOUTBUF;
+// unsigned IOCTL_SNDCTL_DSP_SETSYNCRO = SNDCTL_DSP_SETSYNCRO;
+// unsigned IOCTL_SNDCTL_DSP_SETDUPLEX = SNDCTL_DSP_SETDUPLEX;
+// unsigned IOCTL_SNDCTL_DSP_PROFILE = SNDCTL_DSP_PROFILE;
+// unsigned IOCTL_SNDCTL_DSP_GETODELAY = SNDCTL_DSP_GETODELAY;
+// unsigned IOCTL_SOUND_MIXER_INFO = SOUND_MIXER_INFO;
+// unsigned IOCTL_SOUND_OLD_MIXER_INFO = SOUND_OLD_MIXER_INFO;
+// unsigned IOCTL_OSS_GETVERSION = OSS_GETVERSION;
+// unsigned IOCTL_SNDCTL_SYSINFO = SNDCTL_SYSINFO;
+// unsigned IOCTL_SNDCTL_AUDIOINFO = SNDCTL_AUDIOINFO;
+// unsigned IOCTL_SNDCTL_ENGINEINFO = SNDCTL_ENGINEINFO;
+// unsigned IOCTL_SNDCTL_DSP_GETPLAYVOL = SNDCTL_DSP_GETPLAYVOL;
+// unsigned IOCTL_SNDCTL_DSP_SETPLAYVOL = SNDCTL_DSP_SETPLAYVOL;
+// unsigned IOCTL_SNDCTL_DSP_GETRECVOL = SNDCTL_DSP_GETRECVOL;
+// unsigned IOCTL_SNDCTL_DSP_SETRECVOL = SNDCTL_DSP_SETRECVOL;
+// unsigned IOCTL_SNDCTL_DSP_SKIP = SNDCTL_DSP_SKIP;
+// unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDCTL_DSP_SILENCE;
 
 const int si_SEGV_MAPERR = SEGV_MAPERR;
 const int si_SEGV_ACCERR = SEGV_ACCERR;
diff --git a/lib/libtsan/sanitizer_common/sanitizer_platform_limits_netbsd.h b/lib/libtsan/sanitizer_common/sanitizer_platform_limits_netbsd.h
index 3758a9101c..a41f25f797 100644
--- a/lib/libtsan/sanitizer_common/sanitizer_platform_limits_netbsd.h
+++ b/lib/libtsan/sanitizer_common/sanitizer_platform_limits_netbsd.h
@@ -561,11 +561,11 @@ extern unsigned struct_atabusiodetach_args_sz;
 extern unsigned struct_atabusioscan_args_sz;
 extern unsigned struct_ath_diag_sz;
 extern unsigned struct_atm_flowmap_sz;
-extern unsigned struct_audio_buf_info_sz;
-extern unsigned struct_audio_device_sz;
-extern unsigned struct_audio_encoding_sz;
-extern unsigned struct_audio_info_sz;
-extern unsigned struct_audio_offset_sz;
+// extern unsigned struct_audio_buf_info_sz;
+// extern unsigned struct_audio_device_sz;
+// extern unsigned struct_audio_encoding_sz;
+// extern unsigned struct_audio_info_sz;
+// extern unsigned struct_audio_offset_sz;
 extern unsigned struct_bio_locate_sz;
 extern unsigned struct_bioc_alarm_sz;
 extern unsigned struct_bioc_blink_sz;
@@ -863,22 +863,22 @@ extern unsigned struct_usb_ctl_report_desc_sz;
 extern unsigned struct_usb_ctl_report_sz;
 extern unsigned struct_usb_ctl_request_sz;
 #if defined(__x86_64__)
-extern unsigned struct_nvmm_ioc_capability_sz;
-extern unsigned struct_nvmm_ioc_machine_create_sz;
-extern unsigned struct_nvmm_ioc_machine_destroy_sz;
-extern unsigned struct_nvmm_ioc_machine_configure_sz;
-extern unsigned struct_nvmm_ioc_vcpu_create_sz;
-extern unsigned struct_nvmm_ioc_vcpu_destroy_sz;
-extern unsigned struct_nvmm_ioc_vcpu_configure_sz;
-extern unsigned struct_nvmm_ioc_vcpu_setstate_sz;
-extern unsigned struct_nvmm_ioc_vcpu_getstate_sz;
-extern unsigned struct_nvmm_ioc_vcpu_inject_sz;
-extern unsigned struct_nvmm_ioc_vcpu_run_sz;
-extern unsigned struct_nvmm_ioc_gpa_map_sz;
-extern unsigned struct_nvmm_ioc_gpa_unmap_sz;
-extern unsigned struct_nvmm_ioc_hva_map_sz;
-extern unsigned struct_nvmm_ioc_hva_unmap_sz;
-extern unsigned struct_nvmm_ioc_ctl_sz;
+// extern unsigned struct_nvmm_ioc_capability_sz;
+// extern unsigned struct_nvmm_ioc_machine_create_sz;
+// extern unsigned struct_nvmm_ioc_machine_destroy_sz;
+// extern unsigned struct_nvmm_ioc_machine_configure_sz;
+// extern unsigned struct_nvmm_ioc_vcpu_create_sz;
+// extern unsigned struct_nvmm_ioc_vcpu_destroy_sz;
+// extern unsigned struct_nvmm_ioc_vcpu_configure_sz;
+// extern unsigned struct_nvmm_ioc_vcpu_setstate_sz;
+// extern unsigned struct_nvmm_ioc_vcpu_getstate_sz;
+// extern unsigned struct_nvmm_ioc_vcpu_inject_sz;
+// extern unsigned struct_nvmm_ioc_vcpu_run_sz;
+// extern unsigned struct_nvmm_ioc_gpa_map_sz;
+// extern unsigned struct_nvmm_ioc_gpa_unmap_sz;
+// extern unsigned struct_nvmm_ioc_hva_map_sz;
+// extern unsigned struct_nvmm_ioc_hva_unmap_sz;
+// extern unsigned struct_nvmm_ioc_ctl_sz;
 #endif
 extern unsigned struct_spi_ioctl_configure_sz;
 extern unsigned struct_spi_ioctl_transfer_sz;
@@ -2006,11 +2006,11 @@ extern unsigned IOCTL_OKIOCGVALUE;
 extern unsigned IOCTL_KIOCGSIZE;
 extern unsigned IOCTL_KIOCGVALUE;
 extern unsigned IOCTL_KIOCGSYMBOL;
-extern unsigned IOCTL_LUAINFO;
-extern unsigned IOCTL_LUACREATE;
-extern unsigned IOCTL_LUADESTROY;
-extern unsigned IOCTL_LUAREQUIRE;
-extern unsigned IOCTL_LUALOAD;
+// extern unsigned IOCTL_LUAINFO;
+// extern unsigned IOCTL_LUACREATE;
+// extern unsigned IOCTL_LUADESTROY;
+// extern unsigned IOCTL_LUAREQUIRE;
+// extern unsigned IOCTL_LUALOAD;
 extern unsigned IOCTL_MIDI_PRETIME;
 extern unsigned IOCTL_MIDI_MPUMODE;
 extern unsigned IOCTL_MIDI_MPUCMD;
@@ -2278,48 +2278,48 @@ extern unsigned IOCTL_IPMICTL_SET_MY_ADDRESS_CMD;
 extern unsigned IOCTL_IPMICTL_GET_MY_ADDRESS_CMD;
 extern unsigned IOCTL_IPMICTL_SET_MY_LUN_CMD;
 extern unsigned IOCTL_IPMICTL_GET_MY_LUN_CMD;
-extern unsigned IOCTL_SNDCTL_DSP_RESET;
-extern unsigned IOCTL_SNDCTL_DSP_SYNC;
-extern unsigned IOCTL_SNDCTL_DSP_SPEED;
-extern unsigned IOCTL_SOUND_PCM_READ_RATE;
-extern unsigned IOCTL_SNDCTL_DSP_STEREO;
-extern unsigned IOCTL_SNDCTL_DSP_GETBLKSIZE;
-extern unsigned IOCTL_SNDCTL_DSP_SETFMT;
-extern unsigned IOCTL_SOUND_PCM_READ_BITS;
-extern unsigned IOCTL_SNDCTL_DSP_CHANNELS;
-extern unsigned IOCTL_SOUND_PCM_READ_CHANNELS;
-extern unsigned IOCTL_SOUND_PCM_WRITE_FILTER;
-extern unsigned IOCTL_SOUND_PCM_READ_FILTER;
-extern unsigned IOCTL_SNDCTL_DSP_POST;
-extern unsigned IOCTL_SNDCTL_DSP_SUBDIVIDE;
-extern unsigned IOCTL_SNDCTL_DSP_SETFRAGMENT;
-extern unsigned IOCTL_SNDCTL_DSP_GETFMTS;
-extern unsigned IOCTL_SNDCTL_DSP_GETOSPACE;
-extern unsigned IOCTL_SNDCTL_DSP_GETISPACE;
-extern unsigned IOCTL_SNDCTL_DSP_NONBLOCK;
-extern unsigned IOCTL_SNDCTL_DSP_GETCAPS;
-extern unsigned IOCTL_SNDCTL_DSP_GETTRIGGER;
-extern unsigned IOCTL_SNDCTL_DSP_SETTRIGGER;
-extern unsigned IOCTL_SNDCTL_DSP_GETIPTR;
-extern unsigned IOCTL_SNDCTL_DSP_GETOPTR;
-extern unsigned IOCTL_SNDCTL_DSP_MAPINBUF;
-extern unsigned IOCTL_SNDCTL_DSP_MAPOUTBUF;
-extern unsigned IOCTL_SNDCTL_DSP_SETSYNCRO;
-extern unsigned IOCTL_SNDCTL_DSP_SETDUPLEX;
-extern unsigned IOCTL_SNDCTL_DSP_PROFILE;
-extern unsigned IOCTL_SNDCTL_DSP_GETODELAY;
-extern unsigned IOCTL_SOUND_MIXER_INFO;
-extern unsigned IOCTL_SOUND_OLD_MIXER_INFO;
-extern unsigned IOCTL_OSS_GETVERSION;
-extern unsigned IOCTL_SNDCTL_SYSINFO;
-extern unsigned IOCTL_SNDCTL_AUDIOINFO;
-extern unsigned IOCTL_SNDCTL_ENGINEINFO;
-extern unsigned IOCTL_SNDCTL_DSP_GETPLAYVOL;
-extern unsigned IOCTL_SNDCTL_DSP_SETPLAYVOL;
-extern unsigned IOCTL_SNDCTL_DSP_GETRECVOL;
-extern unsigned IOCTL_SNDCTL_DSP_SETRECVOL;
-extern unsigned IOCTL_SNDCTL_DSP_SKIP;
-extern unsigned IOCTL_SNDCTL_DSP_SILENCE;
+// extern unsigned IOCTL_SNDCTL_DSP_RESET;
+// extern unsigned IOCTL_SNDCTL_DSP_SYNC;
+// extern unsigned IOCTL_SNDCTL_DSP_SPEED;
+// extern unsigned IOCTL_SOUND_PCM_READ_RATE;
+// extern unsigned IOCTL_SNDCTL_DSP_STEREO;
+// extern unsigned IOCTL_SNDCTL_DSP_GETBLKSIZE;
+// extern unsigned IOCTL_SNDCTL_DSP_SETFMT;
+// extern unsigned IOCTL_SOUND_PCM_READ_BITS;
+// extern unsigned IOCTL_SNDCTL_DSP_CHANNELS;
+// extern unsigned IOCTL_SOUND_PCM_READ_CHANNELS;
+// extern unsigned IOCTL_SOUND_PCM_WRITE_FILTER;
+// extern unsigned IOCTL_SOUND_PCM_READ_FILTER;
+// extern unsigned IOCTL_SNDCTL_DSP_POST;
+// extern unsigned IOCTL_SNDCTL_DSP_SUBDIVIDE;
+// extern unsigned IOCTL_SNDCTL_DSP_SETFRAGMENT;
+// extern unsigned IOCTL_SNDCTL_DSP_GETFMTS;
+// extern unsigned IOCTL_SNDCTL_DSP_GETOSPACE;
+// extern unsigned IOCTL_SNDCTL_DSP_GETISPACE;
+// extern unsigned IOCTL_SNDCTL_DSP_NONBLOCK;
+// extern unsigned IOCTL_SNDCTL_DSP_GETCAPS;
+// extern unsigned IOCTL_SNDCTL_DSP_GETTRIGGER;
+// extern unsigned IOCTL_SNDCTL_DSP_SETTRIGGER;
+// extern unsigned IOCTL_SNDCTL_DSP_GETIPTR;
+// extern unsigned IOCTL_SNDCTL_DSP_GETOPTR;
+// extern unsigned IOCTL_SNDCTL_DSP_MAPINBUF;
+// extern unsigned IOCTL_SNDCTL_DSP_MAPOUTBUF;
+// extern unsigned IOCTL_SNDCTL_DSP_SETSYNCRO;
+// extern unsigned IOCTL_SNDCTL_DSP_SETDUPLEX;
+// extern unsigned IOCTL_SNDCTL_DSP_PROFILE;
+// extern unsigned IOCTL_SNDCTL_DSP_GETODELAY;
+// extern unsigned IOCTL_SOUND_MIXER_INFO;
+// extern unsigned IOCTL_SOUND_OLD_MIXER_INFO;
+// extern unsigned IOCTL_OSS_GETVERSION;
+// extern unsigned IOCTL_SNDCTL_SYSINFO;
+// extern unsigned IOCTL_SNDCTL_AUDIOINFO;
+// extern unsigned IOCTL_SNDCTL_ENGINEINFO;
+// extern unsigned IOCTL_SNDCTL_DSP_GETPLAYVOL;
+// extern unsigned IOCTL_SNDCTL_DSP_SETPLAYVOL;
+// extern unsigned IOCTL_SNDCTL_DSP_GETRECVOL;
+// extern unsigned IOCTL_SNDCTL_DSP_SETRECVOL;
+// extern unsigned IOCTL_SNDCTL_DSP_SKIP;
+// extern unsigned IOCTL_SNDCTL_DSP_SILENCE;
 
 extern const int si_SEGV_MAPERR;
 extern const int si_SEGV_ACCERR;