[rtems-libbsd commit] Use <sys/lock.h> provided by Newlib
Sebastian Huber
sebh at rtems.org
Thu Jun 8 11:20:44 UTC 2017
Module: rtems-libbsd
Branch: master
Commit: 3c967ca2388b57d828f16e8b55ec6ccb34824a18
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=3c967ca2388b57d828f16e8b55ec6ccb34824a18
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Thu Jun 8 13:15:12 2017 +0200
Use <sys/lock.h> provided by Newlib
---
builder.py | 1 -
freebsd/sys/arm/lpc/if_lpe.c | 2 +-
freebsd/sys/arm/xilinx/zy7_slcr.c | 2 +-
freebsd/sys/cam/scsi/scsi_all.c | 2 +-
freebsd/sys/dev/bce/if_bce.c | 2 +-
freebsd/sys/dev/dc/dcphy.c | 2 +-
freebsd/sys/dev/dc/pnphy.c | 2 +-
freebsd/sys/dev/dwc/if_dwc.c | 2 +-
freebsd/sys/dev/e1000/e1000_osdep.h | 2 +-
freebsd/sys/dev/evdev/evdev_mt.c | 2 +-
freebsd/sys/dev/evdev/uinput.c | 2 +-
freebsd/sys/dev/fxp/if_fxp.c | 2 +-
freebsd/sys/dev/mmc/mmc.c | 2 +-
freebsd/sys/dev/mmc/mmc_subr.c | 2 +-
freebsd/sys/dev/mmc/mmcsd.c | 2 +-
freebsd/sys/dev/ofw/openfirm.c | 2 +-
freebsd/sys/dev/re/if_re.c | 2 +-
freebsd/sys/dev/rtwn/if_rtwn.c | 2 +-
freebsd/sys/dev/rtwn/if_rtwn_beacon.c | 2 +-
freebsd/sys/dev/rtwn/if_rtwn_calib.c | 2 +-
freebsd/sys/dev/rtwn/if_rtwn_cam.c | 2 +-
freebsd/sys/dev/rtwn/if_rtwn_efuse.c | 2 +-
freebsd/sys/dev/rtwn/if_rtwn_fw.c | 2 +-
freebsd/sys/dev/rtwn/if_rtwn_rx.c | 2 +-
freebsd/sys/dev/rtwn/if_rtwn_task.c | 2 +-
freebsd/sys/dev/rtwn/if_rtwn_tx.c | 2 +-
freebsd/sys/dev/rtwn/pci/rtwn_pci_attach.c | 2 +-
freebsd/sys/dev/rtwn/pci/rtwn_pci_reg.c | 2 +-
freebsd/sys/dev/rtwn/pci/rtwn_pci_rx.c | 2 +-
freebsd/sys/dev/rtwn/pci/rtwn_pci_tx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/r88e_beacon.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/r88e_calib.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/r88e_chan.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/r88e_fw.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/r88e_init.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/r88e_led.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/r88e_rf.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/r88e_rom.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/r88e_rx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/r88e_tx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c | 2 +-
freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_rx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_led.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/r92c_attach.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/r92c_beacon.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/r92c_calib.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/r92c_chan.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/r92c_fw.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/r92c_init.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/r92c_rf.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/r92c_rom.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/r92c_rx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/r92c_tx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/r12a_beacon.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/r12a_calib.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/r12a_caps.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/r12a_chan.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/r12a_fw.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/r12a_init.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/r12a_led.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/r12a_rf.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/r12a_rom.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/r12a_rx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/r12a_tx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_init.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_rx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_tx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8821a/r21a_beacon.c | 2 +-
freebsd/sys/dev/rtwn/rtl8821a/r21a_calib.c | 2 +-
freebsd/sys/dev/rtwn/rtl8821a/r21a_chan.c | 2 +-
freebsd/sys/dev/rtwn/rtl8821a/r21a_fw.c | 2 +-
freebsd/sys/dev/rtwn/rtl8821a/r21a_init.c | 2 +-
freebsd/sys/dev/rtwn/rtl8821a/r21a_led.c | 2 +-
freebsd/sys/dev/rtwn/rtl8821a/r21a_rom.c | 2 +-
freebsd/sys/dev/rtwn/rtl8821a/r21a_rx.c | 2 +-
freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c | 2 +-
freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_dfs.c | 2 +-
freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_init.c | 2 +-
freebsd/sys/dev/rtwn/usb/rtwn_usb_attach.c | 2 +-
freebsd/sys/dev/rtwn/usb/rtwn_usb_ep.c | 2 +-
freebsd/sys/dev/rtwn/usb/rtwn_usb_reg.c | 2 +-
freebsd/sys/dev/rtwn/usb/rtwn_usb_rx.c | 2 +-
freebsd/sys/dev/rtwn/usb/rtwn_usb_tx.c | 2 +-
freebsd/sys/dev/tsec/if_tsec_fdt.c | 2 +-
freebsd/sys/dev/usb/controller/dwc_otg.c | 2 +-
freebsd/sys/dev/usb/controller/ehci.c | 2 +-
freebsd/sys/dev/usb/controller/ohci.c | 2 +-
freebsd/sys/dev/usb/controller/usb_controller.c | 2 +-
freebsd/sys/dev/usb/input/atp.c | 2 +-
freebsd/sys/dev/usb/input/uep.c | 2 +-
freebsd/sys/dev/usb/input/uhid.c | 2 +-
freebsd/sys/dev/usb/input/ukbd.c | 2 +-
freebsd/sys/dev/usb/input/ums.c | 2 +-
freebsd/sys/dev/usb/input/wsp.c | 2 +-
freebsd/sys/dev/usb/net/if_aue.c | 2 +-
freebsd/sys/dev/usb/net/if_axe.c | 2 +-
freebsd/sys/dev/usb/net/if_axge.c | 2 +-
freebsd/sys/dev/usb/net/if_cdce.c | 2 +-
freebsd/sys/dev/usb/net/if_cue.c | 2 +-
freebsd/sys/dev/usb/net/if_ipheth.c | 2 +-
freebsd/sys/dev/usb/net/if_kue.c | 2 +-
freebsd/sys/dev/usb/net/if_mos.c | 2 +-
freebsd/sys/dev/usb/net/if_rue.c | 2 +-
freebsd/sys/dev/usb/net/if_smsc.c | 2 +-
freebsd/sys/dev/usb/net/if_udav.c | 2 +-
freebsd/sys/dev/usb/net/if_ure.c | 2 +-
freebsd/sys/dev/usb/net/usb_ethernet.c | 2 +-
freebsd/sys/dev/usb/quirk/usb_quirk.c | 2 +-
freebsd/sys/dev/usb/serial/u3g.c | 2 +-
freebsd/sys/dev/usb/serial/uark.c | 2 +-
freebsd/sys/dev/usb/serial/ubsa.c | 2 +-
freebsd/sys/dev/usb/serial/ubser.c | 2 +-
freebsd/sys/dev/usb/serial/uchcom.c | 2 +-
freebsd/sys/dev/usb/serial/ucycom.c | 2 +-
freebsd/sys/dev/usb/serial/ufoma.c | 2 +-
freebsd/sys/dev/usb/serial/uftdi.c | 2 +-
freebsd/sys/dev/usb/serial/ugensa.c | 2 +-
freebsd/sys/dev/usb/serial/uipaq.c | 2 +-
freebsd/sys/dev/usb/serial/ulpt.c | 2 +-
freebsd/sys/dev/usb/serial/umcs.c | 2 +-
freebsd/sys/dev/usb/serial/umct.c | 2 +-
freebsd/sys/dev/usb/serial/umodem.c | 2 +-
freebsd/sys/dev/usb/serial/umoscom.c | 2 +-
freebsd/sys/dev/usb/serial/uplcom.c | 2 +-
freebsd/sys/dev/usb/serial/usb_serial.c | 2 +-
freebsd/sys/dev/usb/serial/uslcom.c | 2 +-
freebsd/sys/dev/usb/serial/uvisor.c | 2 +-
freebsd/sys/dev/usb/serial/uvscom.c | 2 +-
freebsd/sys/dev/usb/storage/umass.c | 2 +-
freebsd/sys/dev/usb/usb_busdma.c | 2 +-
freebsd/sys/dev/usb/usb_core.c | 2 +-
freebsd/sys/dev/usb/usb_debug.c | 2 +-
freebsd/sys/dev/usb/usb_dev.c | 2 +-
freebsd/sys/dev/usb/usb_device.c | 2 +-
freebsd/sys/dev/usb/usb_dynamic.c | 2 +-
freebsd/sys/dev/usb/usb_error.c | 2 +-
freebsd/sys/dev/usb/usb_generic.c | 2 +-
freebsd/sys/dev/usb/usb_handle_request.c | 2 +-
freebsd/sys/dev/usb/usb_hid.c | 2 +-
freebsd/sys/dev/usb/usb_hub.c | 2 +-
freebsd/sys/dev/usb/usb_lookup.c | 2 +-
freebsd/sys/dev/usb/usb_mbuf.c | 2 +-
freebsd/sys/dev/usb/usb_msctest.c | 2 +-
freebsd/sys/dev/usb/usb_parse.c | 2 +-
freebsd/sys/dev/usb/usb_process.c | 2 +-
freebsd/sys/dev/usb/usb_request.c | 2 +-
freebsd/sys/dev/usb/usb_transfer.c | 2 +-
freebsd/sys/dev/usb/usb_util.c | 2 +-
freebsd/sys/dev/usb/wlan/if_rum.c | 2 +-
freebsd/sys/dev/usb/wlan/if_run.c | 2 +-
freebsd/sys/dev/usb/wlan/if_uath.c | 2 +-
freebsd/sys/dev/usb/wlan/if_ural.c | 2 +-
freebsd/sys/dev/usb/wlan/if_urtw.c | 2 +-
freebsd/sys/dev/usb/wlan/if_zyd.c | 2 +-
freebsd/sys/fs/devfs/devfs_vnops.c | 2 +-
freebsd/sys/kern/init_main.c | 2 +-
freebsd/sys/kern/kern_condvar.c | 2 +-
freebsd/sys/kern/kern_conf.c | 2 +-
freebsd/sys/kern/kern_event.c | 2 +-
freebsd/sys/kern/kern_intr.c | 2 +-
freebsd/sys/kern/kern_khelp.c | 2 +-
freebsd/sys/kern/kern_linker.c | 2 +-
freebsd/sys/kern/kern_mbuf.c | 2 +-
freebsd/sys/kern/kern_mib.c | 2 +-
freebsd/sys/kern/kern_module.c | 2 +-
freebsd/sys/kern/kern_mtxpool.c | 2 +-
freebsd/sys/kern/kern_osd.c | 2 +-
freebsd/sys/kern/kern_synch.c | 2 +-
freebsd/sys/kern/kern_sysctl.c | 2 +-
freebsd/sys/kern/kern_time.c | 2 +-
freebsd/sys/kern/kern_timeout.c | 2 +-
freebsd/sys/kern/kern_uuid.c | 2 +-
freebsd/sys/kern/subr_bus.c | 2 +-
freebsd/sys/kern/subr_counter.c | 2 +-
freebsd/sys/kern/subr_eventhandler.c | 2 +-
freebsd/sys/kern/subr_firmware.c | 2 +-
freebsd/sys/kern/subr_hints.c | 2 +-
freebsd/sys/kern/subr_kobj.c | 2 +-
freebsd/sys/kern/subr_lock.c | 2 +-
freebsd/sys/kern/subr_pcpu.c | 2 +-
freebsd/sys/kern/subr_prf.c | 2 +-
freebsd/sys/kern/subr_rman.c | 2 +-
freebsd/sys/kern/subr_sleepqueue.c | 2 +-
freebsd/sys/kern/subr_taskqueue.c | 2 +-
freebsd/sys/kern/subr_uio.c | 2 +-
freebsd/sys/kern/subr_unit.c | 2 +-
freebsd/sys/kern/sys_generic.c | 2 +-
freebsd/sys/kern/sys_pipe.c | 2 +-
freebsd/sys/kern/tty_inq.c | 2 +-
freebsd/sys/kern/tty_outq.c | 2 +-
freebsd/sys/kern/uipc_accf.c | 2 +-
freebsd/sys/kern/uipc_domain.c | 2 +-
freebsd/sys/kern/uipc_mbuf.c | 2 +-
freebsd/sys/kern/uipc_mbuf2.c | 2 +-
freebsd/sys/kern/uipc_sockbuf.c | 2 +-
freebsd/sys/kern/uipc_socket.c | 2 +-
freebsd/sys/kern/uipc_syscalls.c | 2 +-
freebsd/sys/kern/uipc_usrreq.c | 2 +-
freebsd/sys/net/altq/if_altq.h | 2 +-
freebsd/sys/net/bpf.c | 2 +-
freebsd/sys/net/bridgestp.c | 2 +-
freebsd/sys/net/ieee8023ad_lacp.c | 2 +-
freebsd/sys/net/if.c | 2 +-
freebsd/sys/net/if_bridge.c | 2 +-
freebsd/sys/net/if_clone.c | 2 +-
freebsd/sys/net/if_ethersubr.c | 2 +-
freebsd/sys/net/if_gif.c | 2 +-
freebsd/sys/net/if_gre.c | 2 +-
freebsd/sys/net/if_lagg.c | 2 +-
freebsd/sys/net/if_llatbl.c | 2 +-
freebsd/sys/net/if_spppsubr.c | 2 +-
freebsd/sys/net/if_stf.c | 2 +-
freebsd/sys/net/if_var.h | 2 +-
freebsd/sys/net/if_vlan.c | 2 +-
freebsd/sys/net/ifq.h | 2 +-
freebsd/sys/net/netisr.c | 2 +-
freebsd/sys/net/pfil.c | 4 +-
freebsd/sys/net/pfil.h | 2 +-
freebsd/sys/net/radix.c | 2 +-
freebsd/sys/net/raw_cb.c | 2 +-
freebsd/sys/net/raw_usrreq.c | 2 +-
freebsd/sys/net/rtsock.c | 2 +-
freebsd/sys/net/vnet.h | 2 +-
freebsd/sys/net80211/ieee80211_freebsd.h | 2 +-
freebsd/sys/netinet/cc/cc.c | 2 +-
freebsd/sys/netinet/if_ether.c | 2 +-
freebsd/sys/netinet/igmp.c | 2 +-
freebsd/sys/netinet/in.c | 2 +-
freebsd/sys/netinet/in_fib.c | 2 +-
freebsd/sys/netinet/in_gif.c | 2 +-
freebsd/sys/netinet/in_mcast.c | 2 +-
freebsd/sys/netinet/in_pcb.c | 2 +-
freebsd/sys/netinet/in_pcb.h | 2 +-
freebsd/sys/netinet/ip_divert.c | 2 +-
freebsd/sys/netinet/ip_encap.c | 2 +-
freebsd/sys/netinet/ip_gre.c | 2 +-
freebsd/sys/netinet/ip_icmp.c | 2 +-
freebsd/sys/netinet/ip_id.c | 2 +-
freebsd/sys/netinet/ip_input.c | 2 +-
freebsd/sys/netinet/ip_mroute.c | 2 +-
freebsd/sys/netinet/ip_output.c | 2 +-
freebsd/sys/netinet/ip_reass.c | 2 +-
freebsd/sys/netinet/libalias/alias_db.c | 2 +-
freebsd/sys/netinet/libalias/alias_local.h | 2 +-
freebsd/sys/netinet/libalias/alias_mod.c | 2 +-
freebsd/sys/netinet/raw_ip.c | 2 +-
freebsd/sys/netinet/sctp_os_bsd.h | 2 +-
freebsd/sys/netinet/tcp_debug.c | 2 +-
freebsd/sys/netinet/tcp_hostcache.c | 2 +-
freebsd/sys/netinet/tcp_output.c | 2 +-
freebsd/sys/netinet/tcp_syncache.c | 2 +-
freebsd/sys/netinet/tcp_timer.c | 2 +-
freebsd/sys/netinet/udp_usrreq.c | 2 +-
freebsd/sys/netinet6/icmp6.c | 2 +-
freebsd/sys/netinet6/in6.c | 2 +-
freebsd/sys/netinet6/in6_fib.c | 2 +-
freebsd/sys/netinet6/in6_gif.c | 2 +-
freebsd/sys/netinet6/in6_ifattach.c | 2 +-
freebsd/sys/netinet6/in6_rmx.c | 2 +-
freebsd/sys/netinet6/in6_src.c | 2 +-
freebsd/sys/netinet6/ip6_input.c | 2 +-
freebsd/sys/netinet6/ip6_mroute.c | 2 +-
freebsd/sys/netinet6/nd6.c | 2 +-
freebsd/sys/netinet6/nd6_nbr.c | 2 +-
freebsd/sys/netinet6/nd6_rtr.c | 2 +-
freebsd/sys/netinet6/raw_ip6.c | 2 +-
freebsd/sys/netinet6/udp6_usrreq.c | 2 +-
freebsd/sys/netipsec/ipsec_mod.c | 2 +-
freebsd/sys/netipsec/ipsec_pcb.c | 2 +-
freebsd/sys/netipsec/key.c | 2 +-
freebsd/sys/netipsec/key_debug.c | 2 +-
freebsd/sys/netipsec/keydb.h | 2 +-
freebsd/sys/netipsec/keysock.c | 2 +-
freebsd/sys/netipsec/subr_ipsec.c | 2 +-
freebsd/sys/netipsec/udpencap.c | 2 +-
freebsd/sys/netipsec/xform_ah.c | 2 +-
freebsd/sys/netipsec/xform_esp.c | 2 +-
freebsd/sys/netipsec/xform_ipcomp.c | 2 +-
freebsd/sys/netipsec/xform_tcp.c | 2 +-
freebsd/sys/netpfil/ipfw/ip_fw2.c | 2 +-
freebsd/sys/netpfil/ipfw/ip_fw_bpf.c | 2 +-
freebsd/sys/netpfil/ipfw/ip_fw_dynamic.c | 2 +-
freebsd/sys/netpfil/ipfw/ip_fw_eaction.c | 2 +-
freebsd/sys/netpfil/ipfw/ip_fw_iface.c | 2 +-
freebsd/sys/netpfil/ipfw/ip_fw_nat.c | 2 +-
freebsd/sys/netpfil/ipfw/ip_fw_pfil.c | 2 +-
freebsd/sys/netpfil/ipfw/ip_fw_sockopt.c | 2 +-
freebsd/sys/netpfil/ipfw/ip_fw_table.c | 2 +-
freebsd/sys/netpfil/ipfw/ip_fw_table_algo.c | 2 +-
freebsd/sys/netpfil/ipfw/ip_fw_table_value.c | 2 +-
freebsd/sys/netpfil/ipfw/nat64/ip_fw_nat64.c | 2 +-
freebsd/sys/netpfil/ipfw/nat64/nat64_translate.c | 2 +-
freebsd/sys/netpfil/ipfw/nat64/nat64lsn.c | 2 +-
freebsd/sys/netpfil/ipfw/nat64/nat64lsn_control.c | 2 +-
freebsd/sys/netpfil/ipfw/nat64/nat64stl.c | 2 +-
freebsd/sys/netpfil/ipfw/nat64/nat64stl_control.c | 2 +-
freebsd/sys/netpfil/ipfw/nptv6/ip_fw_nptv6.c | 2 +-
freebsd/sys/netpfil/ipfw/nptv6/nptv6.c | 2 +-
freebsd/sys/netpfil/pf/if_pfsync.c | 2 +-
freebsd/sys/netpfil/pf/pf_if.c | 2 +-
freebsd/sys/netpfil/pf/pf_ioctl.c | 2 +-
freebsd/sys/netpfil/pf/pf_lb.c | 2 +-
freebsd/sys/netpfil/pf/pf_norm.c | 2 +-
freebsd/sys/netpfil/pf/pf_osfp.c | 2 +-
freebsd/sys/netpfil/pf/pf_table.c | 2 +-
freebsd/sys/opencrypto/crypto.c | 2 +-
freebsd/sys/opencrypto/cryptosoft.c | 2 +-
freebsd/sys/sys/_lock.h | 4 +-
freebsd/sys/sys/buf.h | 2 +-
freebsd/sys/sys/buf_ring.h | 2 +-
freebsd/sys/sys/eventhandler.h | 2 +-
freebsd/sys/sys/fail.h | 2 +-
freebsd/sys/sys/filedesc.h | 2 +-
freebsd/sys/sys/hhook.h | 2 +-
freebsd/sys/sys/jail.h | 2 +-
freebsd/sys/sys/lock_profile.h | 2 +-
freebsd/sys/sys/mbuf.h | 2 +-
freebsd/sys/sys/mount.h | 2 +-
freebsd/sys/sys/seq.h | 2 +-
freebsd/sys/sys/tty.h | 2 +-
freebsd/sys/sys/vnode.h | 2 +-
freebsd/sys/vm/uma_core.c | 2 +-
freebsd/sys/vm/uma_dbg.c | 2 +-
rtemsbsd/include/machine/_kernel_lock.h | 319 ++++++++++++++++++++++
rtemsbsd/include/machine/rtems-bsd-bus-dma.h | 2 +-
rtemsbsd/include/machine/rtems-bsd-muteximpl.h | 2 +-
rtemsbsd/include/rtems/bsd/sys/lock.h | 319 ----------------------
rtemsbsd/rtems/rtems-bsd-generic.c | 2 +-
rtemsbsd/rtems/rtems-kernel-cam.c | 2 +-
rtemsbsd/rtems/rtems-kernel-init.c | 2 +-
rtemsbsd/rtems/rtems-kernel-jail.c | 4 +-
rtemsbsd/rtems/rtems-kernel-mutex.c | 2 +-
rtemsbsd/rtems/rtems-kernel-page.c | 2 +-
rtemsbsd/rtems/rtems-kernel-pci_cfgreg.c | 2 +-
rtemsbsd/rtems/rtems-kernel-program.c | 2 +-
rtemsbsd/rtems/rtems-kernel-rwlock.c | 2 +-
rtemsbsd/rtems/rtems-kernel-sx.c | 2 +-
rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c | 2 +-
rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c | 2 +-
rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c | 2 +-
rtemsbsd/sys/dev/usb/controller/ohci_lpc.c | 2 +-
rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c | 2 +-
testsuite/condvar01/test_main.c | 2 +-
testsuite/mutex01/test_main.c | 2 +-
testsuite/rwlock01/test_main.c | 2 +-
testsuite/sleep01/test_main.c | 2 +-
testsuite/smp01/test_main.c | 2 +-
testsuite/timeout01/timeout_test.c | 13 +-
361 files changed, 683 insertions(+), 689 deletions(-)
diff --git a/builder.py b/builder.py
index af30011..bb633cb 100755
--- a/builder.py
+++ b/builder.py
@@ -230,7 +230,6 @@ def mapCPUDependentPath(path):
return path.replace("include/", "include/machine/")
def fixIncludes(data):
- data = re.sub('#include <sys/lock.h>', '#include <rtems/bsd/sys/lock.h>', data)
data = re.sub('#include <sys/resource.h>', '#include <rtems/bsd/sys/resource.h>', data)
data = re.sub('#include <sys/unistd.h>', '#include <rtems/bsd/sys/unistd.h>', data)
return data
diff --git a/freebsd/sys/arm/lpc/if_lpe.c b/freebsd/sys/arm/lpc/if_lpe.c
index 9c84728..d9c1e38 100755
--- a/freebsd/sys/arm/lpc/if_lpe.c
+++ b/freebsd/sys/arm/lpc/if_lpe.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/rman.h>
#include <sys/bus.h>
diff --git a/freebsd/sys/arm/xilinx/zy7_slcr.c b/freebsd/sys/arm/xilinx/zy7_slcr.c
index 7398af7..57b9ff7 100644
--- a/freebsd/sys/arm/xilinx/zy7_slcr.c
+++ b/freebsd/sys/arm/xilinx/zy7_slcr.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <rtems/bsd/sys/resource.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/cam/scsi/scsi_all.c b/freebsd/sys/cam/scsi/scsi_all.c
index 5f9450c..1c3a8c3 100644
--- a/freebsd/sys/cam/scsi/scsi_all.c
+++ b/freebsd/sys/cam/scsi/scsi_all.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/libkern.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/bce/if_bce.c b/freebsd/sys/dev/bce/if_bce.c
index 2b4a09b..5901c47 100644
--- a/freebsd/sys/dev/bce/if_bce.c
+++ b/freebsd/sys/dev/bce/if_bce.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#include <sys/endian.h>
#include <sys/systm.h>
#include <sys/sockio.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/dev/dc/dcphy.c b/freebsd/sys/dev/dc/dcphy.c
index d702f6f..35ab035 100644
--- a/freebsd/sys/dev/dc/dcphy.c
+++ b/freebsd/sys/dev/dc/dcphy.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/errno.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/bus.h>
diff --git a/freebsd/sys/dev/dc/pnphy.c b/freebsd/sys/dev/dc/pnphy.c
index 488b64d..9848b46 100644
--- a/freebsd/sys/dev/dc/pnphy.c
+++ b/freebsd/sys/dev/dc/pnphy.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/errno.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/bus.h>
diff --git a/freebsd/sys/dev/dwc/if_dwc.c b/freebsd/sys/dev/dwc/if_dwc.c
index 94b1a9d..507547a 100644
--- a/freebsd/sys/dev/dwc/if_dwc.c
+++ b/freebsd/sys/dev/dwc/if_dwc.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/gpio.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/dev/e1000/e1000_osdep.h b/freebsd/sys/dev/e1000/e1000_osdep.h
index 62203ae..c7c23e5 100644
--- a/freebsd/sys/dev/e1000/e1000_osdep.h
+++ b/freebsd/sys/dev/e1000/e1000_osdep.h
@@ -39,7 +39,7 @@
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
diff --git a/freebsd/sys/dev/evdev/evdev_mt.c b/freebsd/sys/dev/evdev/evdev_mt.c
index 3207cd8..6412544 100644
--- a/freebsd/sys/dev/evdev/evdev_mt.c
+++ b/freebsd/sys/dev/evdev/evdev_mt.c
@@ -30,7 +30,7 @@
#include <sys/param.h>
#include <sys/malloc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/systm.h>
diff --git a/freebsd/sys/dev/evdev/uinput.c b/freebsd/sys/dev/evdev/uinput.c
index 1c585e3..efebf02 100644
--- a/freebsd/sys/dev/evdev/uinput.c
+++ b/freebsd/sys/dev/evdev/uinput.c
@@ -43,7 +43,7 @@
#include <sys/poll.h>
#include <sys/selinfo.h>
#include <sys/malloc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/sx.h>
#include <dev/evdev/input.h>
diff --git a/freebsd/sys/dev/fxp/if_fxp.c b/freebsd/sys/dev/fxp/if_fxp.c
index 850a9af..e4cfc2a 100644
--- a/freebsd/sys/dev/fxp/if_fxp.c
+++ b/freebsd/sys/dev/fxp/if_fxp.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/endian.h>
#include <sys/kernel.h>
#include <sys/mbuf.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/dev/mmc/mmc.c b/freebsd/sys/dev/mmc/mmc.c
index d49316e..c19fae7 100644
--- a/freebsd/sys/dev/mmc/mmc.c
+++ b/freebsd/sys/dev/mmc/mmc.c
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/bus.h>
diff --git a/freebsd/sys/dev/mmc/mmc_subr.c b/freebsd/sys/dev/mmc/mmc_subr.c
index 08296d7..f76e963 100644
--- a/freebsd/sys/dev/mmc/mmc_subr.c
+++ b/freebsd/sys/dev/mmc/mmc_subr.c
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/time.h>
diff --git a/freebsd/sys/dev/mmc/mmcsd.c b/freebsd/sys/dev/mmc/mmcsd.c
index b364edf..5066e25 100644
--- a/freebsd/sys/dev/mmc/mmcsd.c
+++ b/freebsd/sys/dev/mmc/mmcsd.c
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
#include <sys/ioccom.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/dev/ofw/openfirm.c b/freebsd/sys/dev/ofw/openfirm.c
index 9bf91f0..7132c41 100644
--- a/freebsd/sys/dev/ofw/openfirm.c
+++ b/freebsd/sys/dev/ofw/openfirm.c
@@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/queue.h>
diff --git a/freebsd/sys/dev/re/if_re.c b/freebsd/sys/dev/re/if_re.c
index 2504624..0a2cb64 100644
--- a/freebsd/sys/dev/re/if_re.c
+++ b/freebsd/sys/dev/re/if_re.c
@@ -123,7 +123,7 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/kernel.h>
#include <sys/socket.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/sysctl.h>
#include <sys/taskqueue.h>
diff --git a/freebsd/sys/dev/rtwn/if_rtwn.c b/freebsd/sys/dev/rtwn/if_rtwn.c
index 326e2a4..6adbee6 100644
--- a/freebsd/sys/dev/rtwn/if_rtwn.c
+++ b/freebsd/sys/dev/rtwn/if_rtwn.c
@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/if_rtwn_beacon.c b/freebsd/sys/dev/rtwn/if_rtwn_beacon.c
index e538015..9ce96a9 100644
--- a/freebsd/sys/dev/rtwn/if_rtwn_beacon.c
+++ b/freebsd/sys/dev/rtwn/if_rtwn_beacon.c
@@ -22,7 +22,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/if_rtwn_calib.c b/freebsd/sys/dev/rtwn/if_rtwn_calib.c
index 8b90aac..1ff5a35 100644
--- a/freebsd/sys/dev/rtwn/if_rtwn_calib.c
+++ b/freebsd/sys/dev/rtwn/if_rtwn_calib.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/if_rtwn_cam.c b/freebsd/sys/dev/rtwn/if_rtwn_cam.c
index 3665842..eceae5b 100644
--- a/freebsd/sys/dev/rtwn/if_rtwn_cam.c
+++ b/freebsd/sys/dev/rtwn/if_rtwn_cam.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/if_rtwn_efuse.c b/freebsd/sys/dev/rtwn/if_rtwn_efuse.c
index 58d2856..c2c3483 100644
--- a/freebsd/sys/dev/rtwn/if_rtwn_efuse.c
+++ b/freebsd/sys/dev/rtwn/if_rtwn_efuse.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/if_rtwn_fw.c b/freebsd/sys/dev/rtwn/if_rtwn_fw.c
index 10ba0de..5be50c3 100644
--- a/freebsd/sys/dev/rtwn/if_rtwn_fw.c
+++ b/freebsd/sys/dev/rtwn/if_rtwn_fw.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/if_rtwn_rx.c b/freebsd/sys/dev/rtwn/if_rtwn_rx.c
index 3beb07d..5dd7260 100644
--- a/freebsd/sys/dev/rtwn/if_rtwn_rx.c
+++ b/freebsd/sys/dev/rtwn/if_rtwn_rx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/if_rtwn_task.c b/freebsd/sys/dev/rtwn/if_rtwn_task.c
index 57b3866..61c2195 100644
--- a/freebsd/sys/dev/rtwn/if_rtwn_task.c
+++ b/freebsd/sys/dev/rtwn/if_rtwn_task.c
@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
#define __LINUX_ERRNO_EXTENSIONS__
#endif /* __rtems__ */
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/if_rtwn_tx.c b/freebsd/sys/dev/rtwn/if_rtwn_tx.c
index 4b7d049..5d623a7 100644
--- a/freebsd/sys/dev/rtwn/if_rtwn_tx.c
+++ b/freebsd/sys/dev/rtwn/if_rtwn_tx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/pci/rtwn_pci_attach.c b/freebsd/sys/dev/rtwn/pci/rtwn_pci_attach.c
index 8abf131..85ede40 100644
--- a/freebsd/sys/dev/rtwn/pci/rtwn_pci_attach.c
+++ b/freebsd/sys/dev/rtwn/pci/rtwn_pci_attach.c
@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/pci/rtwn_pci_reg.c b/freebsd/sys/dev/rtwn/pci/rtwn_pci_reg.c
index b3434ca..8ce54f0 100644
--- a/freebsd/sys/dev/rtwn/pci/rtwn_pci_reg.c
+++ b/freebsd/sys/dev/rtwn/pci/rtwn_pci_reg.c
@@ -24,7 +24,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/pci/rtwn_pci_rx.c b/freebsd/sys/dev/rtwn/pci/rtwn_pci_rx.c
index 533bf23..150500d 100644
--- a/freebsd/sys/dev/rtwn/pci/rtwn_pci_rx.c
+++ b/freebsd/sys/dev/rtwn/pci/rtwn_pci_rx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/pci/rtwn_pci_tx.c b/freebsd/sys/dev/rtwn/pci/rtwn_pci_tx.c
index 943be37..50e915e 100644
--- a/freebsd/sys/dev/rtwn/pci/rtwn_pci_tx.c
+++ b/freebsd/sys/dev/rtwn/pci/rtwn_pci_tx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_beacon.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_beacon.c
index 0514956..316baaf 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_beacon.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_beacon.c
@@ -22,7 +22,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_calib.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_calib.c
index 9922592..592f391 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_calib.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_calib.c
@@ -22,7 +22,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_chan.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_chan.c
index f878469..8b8ad7a 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_chan.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_chan.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_fw.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_fw.c
index 45e5159..ddc9d0a 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_fw.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_fw.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_init.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_init.c
index 579684a..5225c43 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_init.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_init.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_led.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_led.c
index 1dd7308..0bfa991 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_led.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_led.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_rf.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_rf.c
index 0cf7779..196b663 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_rf.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_rf.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_rom.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_rom.c
index 88808cd..e1337db 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_rom.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_rom.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_rx.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_rx.c
index ad4efeb..8815987 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_rx.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_rx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/r88e_tx.c b/freebsd/sys/dev/rtwn/rtl8188e/r88e_tx.c
index f993ac9..539cd50 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/r88e_tx.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/r88e_tx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c b/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c
index 612e2a8..f5ac1d9 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c b/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c
index 899e5bd..2c77667 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_rx.c b/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_rx.c
index a5a34f0..534fe73 100644
--- a/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_rx.c
+++ b/freebsd/sys/dev/rtwn/rtl8188e/usb/r88eu_rx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c
index cd442f0..e43d3ac 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c
index 645eaa3..070f6e1 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c
index 9f27716..85b4ab6 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c
index fb60a47..151d9fc 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_led.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_led.c
index 91fab7d..d566da6 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_led.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_led.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c
index 3df1211..203b0bf 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c
index af5ce97..738c1fd 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_attach.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_attach.c
index 3a7f428..8740db6 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_attach.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_attach.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_beacon.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_beacon.c
index 2992d63..a434794 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_beacon.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_beacon.c
@@ -22,7 +22,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_calib.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_calib.c
index 9f6bc07..6c18a60 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_calib.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_calib.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_chan.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_chan.c
index 0dc365b..dc6b303 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_chan.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_chan.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_fw.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_fw.c
index 868a86a..ab8b498 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_fw.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_fw.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_init.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_init.c
index 973a941..199a419 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_init.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_init.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_rf.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_rf.c
index 4a4df3a..f7cb695 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_rf.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_rf.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_rom.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_rom.c
index c444a44..1eb5ca1 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_rom.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_rom.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_rx.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_rx.c
index db66f1c..b877fb8 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_rx.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_rx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/r92c_tx.c b/freebsd/sys/dev/rtwn/rtl8192c/r92c_tx.c
index 179770b..454da87 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/r92c_tx.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/r92c_tx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c
index 5e29c0a..4696e8c 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c
index d4e79e0..61dd1aa 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c
index 3c76ce2..9c4a777 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c
index 0e31a1f..4d040a4 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c
index d84176a..9bef768 100644
--- a/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c
+++ b/freebsd/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c
@@ -22,7 +22,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_beacon.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_beacon.c
index 63abbc0..9c67fff 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_beacon.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_beacon.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_calib.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_calib.c
index ceccc49..18fbf23 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_calib.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_calib.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_caps.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_caps.c
index 43d99af..a6cc9ed 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_caps.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_caps.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/sockio.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_chan.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_chan.c
index 2055092..5249c49 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_chan.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_chan.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_fw.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_fw.c
index 0ee4a3a..ce986f2 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_fw.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_fw.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_init.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_init.c
index 1182287..6b6b302 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_init.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_init.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_led.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_led.c
index d92a34c..9a11ba4 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_led.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_led.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_rf.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_rf.c
index bcf7001..bb00a48 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_rf.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_rf.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_rom.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_rom.c
index 72fc494..6f094fe 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_rom.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_rom.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_rx.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_rx.c
index dc426ef..dd90d7e 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_rx.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_rx.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/r12a_tx.c b/freebsd/sys/dev/rtwn/rtl8812a/r12a_tx.c
index 53e3de9..c5a9e46 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/r12a_tx.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/r12a_tx.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c
index 7f3ff96..08e1621 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_init.c b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_init.c
index 710e7dc..2901642 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_init.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_init.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_rx.c b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_rx.c
index adc8f51..fcce20c 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_rx.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_rx.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_tx.c b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_tx.c
index 18a7cb3..66d9c2d 100644
--- a/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_tx.c
+++ b/freebsd/sys/dev/rtwn/rtl8812a/usb/r12au_tx.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_beacon.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_beacon.c
index 3cdf59b..d9fdb85 100644
--- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_beacon.c
+++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_beacon.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_calib.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_calib.c
index c2bb1e9..ba9354d 100644
--- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_calib.c
+++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_calib.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_chan.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_chan.c
index 91e72f7..aadeeeb 100644
--- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_chan.c
+++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_chan.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_fw.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_fw.c
index 5964d46..94eb05d 100644
--- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_fw.c
+++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_fw.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_init.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_init.c
index 351961c..3659f41 100644
--- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_init.c
+++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_init.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_led.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_led.c
index 120843d..e1ce907 100644
--- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_led.c
+++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_led.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_rom.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_rom.c
index 67e421d..ec18a82 100644
--- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_rom.c
+++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_rom.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8821a/r21a_rx.c b/freebsd/sys/dev/rtwn/rtl8821a/r21a_rx.c
index 73f8d01..b352d01 100644
--- a/freebsd/sys/dev/rtwn/rtl8821a/r21a_rx.c
+++ b/freebsd/sys/dev/rtwn/rtl8821a/r21a_rx.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c b/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c
index 47fd071..5cf721c 100644
--- a/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c
+++ b/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_dfs.c b/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_dfs.c
index c686d82..bf79fc8 100644
--- a/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_dfs.c
+++ b/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_dfs.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_init.c b/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_init.c
index 447771f..31366e5 100644
--- a/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_init.c
+++ b/freebsd/sys/dev/rtwn/rtl8821a/usb/r21au_init.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/usb/rtwn_usb_attach.c b/freebsd/sys/dev/rtwn/usb/rtwn_usb_attach.c
index eca3881..93e1f76 100644
--- a/freebsd/sys/dev/rtwn/usb/rtwn_usb_attach.c
+++ b/freebsd/sys/dev/rtwn/usb/rtwn_usb_attach.c
@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/usb/rtwn_usb_ep.c b/freebsd/sys/dev/rtwn/usb/rtwn_usb_ep.c
index cd57743..ef7d1ff 100644
--- a/freebsd/sys/dev/rtwn/usb/rtwn_usb_ep.c
+++ b/freebsd/sys/dev/rtwn/usb/rtwn_usb_ep.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/mbuf.h>
diff --git a/freebsd/sys/dev/rtwn/usb/rtwn_usb_reg.c b/freebsd/sys/dev/rtwn/usb/rtwn_usb_reg.c
index 82180f8..8225282 100644
--- a/freebsd/sys/dev/rtwn/usb/rtwn_usb_reg.c
+++ b/freebsd/sys/dev/rtwn/usb/rtwn_usb_reg.c
@@ -24,7 +24,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/usb/rtwn_usb_rx.c b/freebsd/sys/dev/rtwn/usb/rtwn_usb_rx.c
index 4c3414e..4f39b58 100644
--- a/freebsd/sys/dev/rtwn/usb/rtwn_usb_rx.c
+++ b/freebsd/sys/dev/rtwn/usb/rtwn_usb_rx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/rtwn/usb/rtwn_usb_tx.c b/freebsd/sys/dev/rtwn/usb/rtwn_usb_tx.c
index c5bd56d..7bede4d 100644
--- a/freebsd/sys/dev/rtwn/usb/rtwn_usb_tx.c
+++ b/freebsd/sys/dev/rtwn/usb/rtwn_usb_tx.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_wlan.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/tsec/if_tsec_fdt.c b/freebsd/sys/dev/tsec/if_tsec_fdt.c
index bf65057..476a5bf 100644
--- a/freebsd/sys/dev/tsec/if_tsec_fdt.c
+++ b/freebsd/sys/dev/tsec/if_tsec_fdt.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/endian.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/usb/controller/dwc_otg.c b/freebsd/sys/dev/usb/controller/dwc_otg.c
index 0018110..421eb77 100644
--- a/freebsd/sys/dev/usb/controller/dwc_otg.c
+++ b/freebsd/sys/dev/usb/controller/dwc_otg.c
@@ -57,7 +57,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/controller/ehci.c b/freebsd/sys/dev/usb/controller/ehci.c
index 1d72828..9de1491 100644
--- a/freebsd/sys/dev/usb/controller/ehci.c
+++ b/freebsd/sys/dev/usb/controller/ehci.c
@@ -58,7 +58,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/controller/ohci.c b/freebsd/sys/dev/usb/controller/ohci.c
index c89628e..9f0654e 100644
--- a/freebsd/sys/dev/usb/controller/ohci.c
+++ b/freebsd/sys/dev/usb/controller/ohci.c
@@ -47,7 +47,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/controller/usb_controller.c b/freebsd/sys/dev/usb/controller/usb_controller.c
index dbc3aec..5f198ae 100644
--- a/freebsd/sys/dev/usb/controller/usb_controller.c
+++ b/freebsd/sys/dev/usb/controller/usb_controller.c
@@ -40,7 +40,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/input/atp.c b/freebsd/sys/dev/usb/input/atp.c
index 2e9407e..1716241 100644
--- a/freebsd/sys/dev/usb/input/atp.c
+++ b/freebsd/sys/dev/usb/input/atp.c
@@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/sysctl.h>
#include <sys/malloc.h>
diff --git a/freebsd/sys/dev/usb/input/uep.c b/freebsd/sys/dev/usb/input/uep.c
index e466361..d7af405 100644
--- a/freebsd/sys/dev/usb/input/uep.c
+++ b/freebsd/sys/dev/usb/input/uep.c
@@ -37,7 +37,7 @@
#include <sys/callout.h>
#include <sys/conf.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/input/uhid.c b/freebsd/sys/dev/usb/input/uhid.c
index b6f2164..6de5944 100644
--- a/freebsd/sys/dev/usb/input/uhid.c
+++ b/freebsd/sys/dev/usb/input/uhid.c
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/input/ukbd.c b/freebsd/sys/dev/usb/input/ukbd.c
index dc0a1ef..d473d1e 100644
--- a/freebsd/sys/dev/usb/input/ukbd.c
+++ b/freebsd/sys/dev/usb/input/ukbd.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/input/ums.c b/freebsd/sys/dev/usb/input/ums.c
index a60dbdd..36c1d1b 100644
--- a/freebsd/sys/dev/usb/input/ums.c
+++ b/freebsd/sys/dev/usb/input/ums.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/input/wsp.c b/freebsd/sys/dev/usb/input/wsp.c
index 1e3d8f8..d3eae49 100644
--- a/freebsd/sys/dev/usb/input/wsp.c
+++ b/freebsd/sys/dev/usb/input/wsp.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/bus.h>
#include <sys/conf.h>
diff --git a/freebsd/sys/dev/usb/net/if_aue.c b/freebsd/sys/dev/usb/net/if_aue.c
index bc5e100..06ccd8c 100644
--- a/freebsd/sys/dev/usb/net/if_aue.c
+++ b/freebsd/sys/dev/usb/net/if_aue.c
@@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/net/if_axe.c b/freebsd/sys/dev/usb/net/if_axe.c
index d071d67..728f8e3 100644
--- a/freebsd/sys/dev/usb/net/if_axe.c
+++ b/freebsd/sys/dev/usb/net/if_axe.c
@@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$");
#include <sys/condvar.h>
#include <sys/endian.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/dev/usb/net/if_axge.c b/freebsd/sys/dev/usb/net/if_axge.c
index c4310c9..4e6f05b 100644
--- a/freebsd/sys/dev/usb/net/if_axge.c
+++ b/freebsd/sys/dev/usb/net/if_axge.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
#include <sys/condvar.h>
#include <sys/endian.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/dev/usb/net/if_cdce.c b/freebsd/sys/dev/usb/net/if_cdce.c
index b42e6a3..777113d 100644
--- a/freebsd/sys/dev/usb/net/if_cdce.c
+++ b/freebsd/sys/dev/usb/net/if_cdce.c
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/net/if_cue.c b/freebsd/sys/dev/usb/net/if_cue.c
index a5a3e95..d5152dd 100644
--- a/freebsd/sys/dev/usb/net/if_cue.c
+++ b/freebsd/sys/dev/usb/net/if_cue.c
@@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/net/if_ipheth.c b/freebsd/sys/dev/usb/net/if_ipheth.c
index 513499b..2eaf88b 100644
--- a/freebsd/sys/dev/usb/net/if_ipheth.c
+++ b/freebsd/sys/dev/usb/net/if_ipheth.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/dev/usb/net/if_kue.c b/freebsd/sys/dev/usb/net/if_kue.c
index e1282f3..26e0945 100644
--- a/freebsd/sys/dev/usb/net/if_kue.c
+++ b/freebsd/sys/dev/usb/net/if_kue.c
@@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/net/if_mos.c b/freebsd/sys/dev/usb/net/if_mos.c
index 9cc23f6..8cac903 100644
--- a/freebsd/sys/dev/usb/net/if_mos.c
+++ b/freebsd/sys/dev/usb/net/if_mos.c
@@ -108,7 +108,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/net/if_rue.c b/freebsd/sys/dev/usb/net/if_rue.c
index 669c5ac..e816a19 100644
--- a/freebsd/sys/dev/usb/net/if_rue.c
+++ b/freebsd/sys/dev/usb/net/if_rue.c
@@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/net/if_smsc.c b/freebsd/sys/dev/usb/net/if_smsc.c
index c63b532..9c028b4 100644
--- a/freebsd/sys/dev/usb/net/if_smsc.c
+++ b/freebsd/sys/dev/usb/net/if_smsc.c
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/dev/usb/net/if_udav.c b/freebsd/sys/dev/usb/net/if_udav.c
index 1b1e3cb..b8393ab 100644
--- a/freebsd/sys/dev/usb/net/if_udav.c
+++ b/freebsd/sys/dev/usb/net/if_udav.c
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/net/if_ure.c b/freebsd/sys/dev/usb/net/if_ure.c
index 649d496..27e3ecc 100644
--- a/freebsd/sys/dev/usb/net/if_ure.c
+++ b/freebsd/sys/dev/usb/net/if_ure.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/condvar.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/dev/usb/net/usb_ethernet.c b/freebsd/sys/dev/usb/net/usb_ethernet.c
index fa594d6..32c0fa2 100644
--- a/freebsd/sys/dev/usb/net/usb_ethernet.c
+++ b/freebsd/sys/dev/usb/net/usb_ethernet.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/condvar.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/dev/usb/quirk/usb_quirk.c b/freebsd/sys/dev/usb/quirk/usb_quirk.c
index 993068c..ce57f11 100644
--- a/freebsd/sys/dev/usb/quirk/usb_quirk.c
+++ b/freebsd/sys/dev/usb/quirk/usb_quirk.c
@@ -37,7 +37,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/u3g.c b/freebsd/sys/dev/usb/serial/u3g.c
index 520a414..3582b6d 100644
--- a/freebsd/sys/dev/usb/serial/u3g.c
+++ b/freebsd/sys/dev/usb/serial/u3g.c
@@ -42,7 +42,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/uark.c b/freebsd/sys/dev/usb/serial/uark.c
index 4eb6ddf..01f1dcd 100644
--- a/freebsd/sys/dev/usb/serial/uark.c
+++ b/freebsd/sys/dev/usb/serial/uark.c
@@ -35,7 +35,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/ubsa.c b/freebsd/sys/dev/usb/serial/ubsa.c
index 5c8643f..61005fa 100644
--- a/freebsd/sys/dev/usb/serial/ubsa.c
+++ b/freebsd/sys/dev/usb/serial/ubsa.c
@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/ubser.c b/freebsd/sys/dev/usb/serial/ubser.c
index 00787ab..534c5e7 100644
--- a/freebsd/sys/dev/usb/serial/ubser.c
+++ b/freebsd/sys/dev/usb/serial/ubser.c
@@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/uchcom.c b/freebsd/sys/dev/usb/serial/uchcom.c
index 338dc9b..3bee03d 100644
--- a/freebsd/sys/dev/usb/serial/uchcom.c
+++ b/freebsd/sys/dev/usb/serial/uchcom.c
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/ucycom.c b/freebsd/sys/dev/usb/serial/ucycom.c
index b214609..6f83d45 100644
--- a/freebsd/sys/dev/usb/serial/ucycom.c
+++ b/freebsd/sys/dev/usb/serial/ucycom.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/ufoma.c b/freebsd/sys/dev/usb/serial/ufoma.c
index b48f062..bcd7030 100644
--- a/freebsd/sys/dev/usb/serial/ufoma.c
+++ b/freebsd/sys/dev/usb/serial/ufoma.c
@@ -86,7 +86,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/uftdi.c b/freebsd/sys/dev/usb/serial/uftdi.c
index 0e3f29e..a40ee4f 100644
--- a/freebsd/sys/dev/usb/serial/uftdi.c
+++ b/freebsd/sys/dev/usb/serial/uftdi.c
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/ugensa.c b/freebsd/sys/dev/usb/serial/ugensa.c
index 2eb62fb..15f6c9e 100644
--- a/freebsd/sys/dev/usb/serial/ugensa.c
+++ b/freebsd/sys/dev/usb/serial/ugensa.c
@@ -46,7 +46,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/uipaq.c b/freebsd/sys/dev/usb/serial/uipaq.c
index 77fea22..b512b0e 100644
--- a/freebsd/sys/dev/usb/serial/uipaq.c
+++ b/freebsd/sys/dev/usb/serial/uipaq.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/ulpt.c b/freebsd/sys/dev/usb/serial/ulpt.c
index c0780c4..bd2d966 100644
--- a/freebsd/sys/dev/usb/serial/ulpt.c
+++ b/freebsd/sys/dev/usb/serial/ulpt.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/umcs.c b/freebsd/sys/dev/usb/serial/umcs.c
index fac1b6e..5d803e4 100644
--- a/freebsd/sys/dev/usb/serial/umcs.c
+++ b/freebsd/sys/dev/usb/serial/umcs.c
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/linker_set.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/umct.c b/freebsd/sys/dev/usb/serial/umct.c
index 2dd1d25..5c00985 100644
--- a/freebsd/sys/dev/usb/serial/umct.c
+++ b/freebsd/sys/dev/usb/serial/umct.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/umodem.c b/freebsd/sys/dev/usb/serial/umodem.c
index 0d1966a..2d36f12 100644
--- a/freebsd/sys/dev/usb/serial/umodem.c
+++ b/freebsd/sys/dev/usb/serial/umodem.c
@@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/umoscom.c b/freebsd/sys/dev/usb/serial/umoscom.c
index edfab5c..be45f51 100644
--- a/freebsd/sys/dev/usb/serial/umoscom.c
+++ b/freebsd/sys/dev/usb/serial/umoscom.c
@@ -28,7 +28,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/uplcom.c b/freebsd/sys/dev/usb/serial/uplcom.c
index 0247422..7ec41e9 100644
--- a/freebsd/sys/dev/usb/serial/uplcom.c
+++ b/freebsd/sys/dev/usb/serial/uplcom.c
@@ -88,7 +88,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/usb_serial.c b/freebsd/sys/dev/usb/serial/usb_serial.c
index dc3cf40..eb3adab 100644
--- a/freebsd/sys/dev/usb/serial/usb_serial.c
+++ b/freebsd/sys/dev/usb/serial/usb_serial.c
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/uslcom.c b/freebsd/sys/dev/usb/serial/uslcom.c
index 865a239..08a563d 100644
--- a/freebsd/sys/dev/usb/serial/uslcom.c
+++ b/freebsd/sys/dev/usb/serial/uslcom.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/uvisor.c b/freebsd/sys/dev/usb/serial/uvisor.c
index 7941cf7..c749b41 100644
--- a/freebsd/sys/dev/usb/serial/uvisor.c
+++ b/freebsd/sys/dev/usb/serial/uvisor.c
@@ -58,7 +58,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/serial/uvscom.c b/freebsd/sys/dev/usb/serial/uvscom.c
index 8065d3b..04d92a4 100644
--- a/freebsd/sys/dev/usb/serial/uvscom.c
+++ b/freebsd/sys/dev/usb/serial/uvscom.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/storage/umass.c b/freebsd/sys/dev/usb/storage/umass.c
index d699c63..c99874e 100644
--- a/freebsd/sys/dev/usb/storage/umass.c
+++ b/freebsd/sys/dev/usb/storage/umass.c
@@ -113,7 +113,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_busdma.c b/freebsd/sys/dev/usb/usb_busdma.c
index 3d6b90c..c0410d3 100644
--- a/freebsd/sys/dev/usb/usb_busdma.c
+++ b/freebsd/sys/dev/usb/usb_busdma.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_core.c b/freebsd/sys/dev/usb/usb_core.c
index 5a20d53..3d9daa2 100644
--- a/freebsd/sys/dev/usb/usb_core.c
+++ b/freebsd/sys/dev/usb/usb_core.c
@@ -44,7 +44,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_debug.c b/freebsd/sys/dev/usb/usb_debug.c
index e951a34..000319b 100644
--- a/freebsd/sys/dev/usb/usb_debug.c
+++ b/freebsd/sys/dev/usb/usb_debug.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_dev.c b/freebsd/sys/dev/usb/usb_dev.c
index 9994075..b0ad9aa 100644
--- a/freebsd/sys/dev/usb/usb_dev.c
+++ b/freebsd/sys/dev/usb/usb_dev.c
@@ -41,7 +41,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_device.c b/freebsd/sys/dev/usb/usb_device.c
index 6a5cd62..6a193a7 100644
--- a/freebsd/sys/dev/usb/usb_device.c
+++ b/freebsd/sys/dev/usb/usb_device.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_dynamic.c b/freebsd/sys/dev/usb/usb_dynamic.c
index 2a62a7f..c2ca9af 100644
--- a/freebsd/sys/dev/usb/usb_dynamic.c
+++ b/freebsd/sys/dev/usb/usb_dynamic.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_error.c b/freebsd/sys/dev/usb/usb_error.c
index fe97127..2cc4996 100644
--- a/freebsd/sys/dev/usb/usb_error.c
+++ b/freebsd/sys/dev/usb/usb_error.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_generic.c b/freebsd/sys/dev/usb/usb_generic.c
index c32481f..ae14bae 100644
--- a/freebsd/sys/dev/usb/usb_generic.c
+++ b/freebsd/sys/dev/usb/usb_generic.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_handle_request.c b/freebsd/sys/dev/usb/usb_handle_request.c
index 92a9455..c6b4db3 100644
--- a/freebsd/sys/dev/usb/usb_handle_request.c
+++ b/freebsd/sys/dev/usb/usb_handle_request.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_hid.c b/freebsd/sys/dev/usb/usb_hid.c
index 089db28..56e31a6 100644
--- a/freebsd/sys/dev/usb/usb_hid.c
+++ b/freebsd/sys/dev/usb/usb_hid.c
@@ -44,7 +44,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_hub.c b/freebsd/sys/dev/usb/usb_hub.c
index 0ca9f05..e70be43 100644
--- a/freebsd/sys/dev/usb/usb_hub.c
+++ b/freebsd/sys/dev/usb/usb_hub.c
@@ -44,7 +44,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_lookup.c b/freebsd/sys/dev/usb/usb_lookup.c
index 13e0b8b..533080e 100644
--- a/freebsd/sys/dev/usb/usb_lookup.c
+++ b/freebsd/sys/dev/usb/usb_lookup.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_mbuf.c b/freebsd/sys/dev/usb/usb_mbuf.c
index 168f612..b1cc327 100644
--- a/freebsd/sys/dev/usb/usb_mbuf.c
+++ b/freebsd/sys/dev/usb/usb_mbuf.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_msctest.c b/freebsd/sys/dev/usb/usb_msctest.c
index d5d23c1..f0eede2 100644
--- a/freebsd/sys/dev/usb/usb_msctest.c
+++ b/freebsd/sys/dev/usb/usb_msctest.c
@@ -46,7 +46,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_parse.c b/freebsd/sys/dev/usb/usb_parse.c
index e88389f..776e1f0 100644
--- a/freebsd/sys/dev/usb/usb_parse.c
+++ b/freebsd/sys/dev/usb/usb_parse.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_process.c b/freebsd/sys/dev/usb/usb_process.c
index 1c435f1..88f0980 100644
--- a/freebsd/sys/dev/usb/usb_process.c
+++ b/freebsd/sys/dev/usb/usb_process.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_request.c b/freebsd/sys/dev/usb/usb_request.c
index 9ad8926..ef8ed3e 100644
--- a/freebsd/sys/dev/usb/usb_request.c
+++ b/freebsd/sys/dev/usb/usb_request.c
@@ -40,7 +40,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_transfer.c b/freebsd/sys/dev/usb/usb_transfer.c
index 2d64291..ee80d9b 100644
--- a/freebsd/sys/dev/usb/usb_transfer.c
+++ b/freebsd/sys/dev/usb/usb_transfer.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/usb_util.c b/freebsd/sys/dev/usb/usb_util.c
index 92ebb37..4d8c9c5 100644
--- a/freebsd/sys/dev/usb/usb_util.c
+++ b/freebsd/sys/dev/usb/usb_util.c
@@ -38,7 +38,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/dev/usb/wlan/if_rum.c b/freebsd/sys/dev/usb/wlan/if_rum.c
index 24d736f..9996576 100644
--- a/freebsd/sys/dev/usb/wlan/if_rum.c
+++ b/freebsd/sys/dev/usb/wlan/if_rum.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/usb/wlan/if_run.c b/freebsd/sys/dev/usb/wlan/if_run.c
index 3033892..d9bda8c 100644
--- a/freebsd/sys/dev/usb/wlan/if_run.c
+++ b/freebsd/sys/dev/usb/wlan/if_run.c
@@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/usb/wlan/if_uath.c b/freebsd/sys/dev/usb/wlan/if_uath.c
index 6204587..c3435d5 100644
--- a/freebsd/sys/dev/usb/wlan/if_uath.c
+++ b/freebsd/sys/dev/usb/wlan/if_uath.c
@@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/usb/wlan/if_ural.c b/freebsd/sys/dev/usb/wlan/if_ural.c
index 3595160..2f237d7 100644
--- a/freebsd/sys/dev/usb/wlan/if_ural.c
+++ b/freebsd/sys/dev/usb/wlan/if_ural.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/usb/wlan/if_urtw.c b/freebsd/sys/dev/usb/wlan/if_urtw.c
index 14865bc..d94cbee 100644
--- a/freebsd/sys/dev/usb/wlan/if_urtw.c
+++ b/freebsd/sys/dev/usb/wlan/if_urtw.c
@@ -21,7 +21,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/dev/usb/wlan/if_zyd.c b/freebsd/sys/dev/usb/wlan/if_zyd.c
index 4827552..3ae5616 100644
--- a/freebsd/sys/dev/usb/wlan/if_zyd.c
+++ b/freebsd/sys/dev/usb/wlan/if_zyd.c
@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/sockio.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/mbuf.h>
diff --git a/freebsd/sys/fs/devfs/devfs_vnops.c b/freebsd/sys/fs/devfs/devfs_vnops.c
index defa10b..9725d3f 100644
--- a/freebsd/sys/fs/devfs/devfs_vnops.c
+++ b/freebsd/sys/fs/devfs/devfs_vnops.c
@@ -51,7 +51,7 @@
#include <sys/filio.h>
#include <sys/jail.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mman.h>
#include <sys/mount.h>
diff --git a/freebsd/sys/kern/init_main.c b/freebsd/sys/kern/init_main.c
index d1ca1f8..467888b 100644
--- a/freebsd/sys/kern/init_main.c
+++ b/freebsd/sys/kern/init_main.c
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
#include <sys/filedesc.h>
#include <sys/jail.h>
#include <sys/ktr.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/loginclass.h>
#include <sys/mount.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/kern/kern_condvar.c b/freebsd/sys/kern/kern_condvar.c
index 2ce5537..927a722 100644
--- a/freebsd/sys/kern/kern_condvar.c
+++ b/freebsd/sys/kern/kern_condvar.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/limits.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/kern/kern_conf.c b/freebsd/sys/kern/kern_conf.c
index ce09954..8ad8c7c 100644
--- a/freebsd/sys/kern/kern_conf.c
+++ b/freebsd/sys/kern/kern_conf.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/bio.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/module.h>
#include <sys/malloc.h>
diff --git a/freebsd/sys/kern/kern_event.c b/freebsd/sys/kern/kern_event.c
index 880c079..7f1b926 100644
--- a/freebsd/sys/kern/kern_event.c
+++ b/freebsd/sys/kern/kern_event.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/capsicum.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/rwlock.h>
#include <sys/proc.h>
diff --git a/freebsd/sys/kern/kern_intr.c b/freebsd/sys/kern/kern_intr.c
index b1547da..c3d30c3 100644
--- a/freebsd/sys/kern/kern_intr.c
+++ b/freebsd/sys/kern/kern_intr.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kthread.h>
#include <sys/ktr.h>
#include <sys/limits.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/priv.h>
diff --git a/freebsd/sys/kern/kern_khelp.c b/freebsd/sys/kern/kern_khelp.c
index 490d11b..7ff7646 100644
--- a/freebsd/sys/kern/kern_khelp.c
+++ b/freebsd/sys/kern/kern_khelp.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/hhook.h>
#include <sys/khelp.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/module_khelp.h>
diff --git a/freebsd/sys/kern/kern_linker.c b/freebsd/sys/kern/kern_linker.c
index c592c15..214554d 100644
--- a/freebsd/sys/kern/kern_linker.c
+++ b/freebsd/sys/kern/kern_linker.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysent.h>
#include <sys/priv.h>
#include <sys/proc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/sx.h>
#include <sys/module.h>
diff --git a/freebsd/sys/kern/kern_mbuf.c b/freebsd/sys/kern/kern_mbuf.c
index c198e93..472e089 100644
--- a/freebsd/sys/kern/kern_mbuf.c
+++ b/freebsd/sys/kern/kern_mbuf.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
#include <sys/domain.h>
#include <sys/eventhandler.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/protosw.h>
#include <sys/smp.h>
diff --git a/freebsd/sys/kern/kern_mib.c b/freebsd/sys/kern/kern_mib.c
index 436860a..6dc8a20 100644
--- a/freebsd/sys/kern/kern_mib.c
+++ b/freebsd/sys/kern/kern_mib.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/random.h>
diff --git a/freebsd/sys/kern/kern_module.c b/freebsd/sys/kern/kern_module.c
index 0b239f0..28aa8b2 100644
--- a/freebsd/sys/kern/kern_module.c
+++ b/freebsd/sys/kern/kern_module.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysproto.h>
#include <sys/sysent.h>
#include <sys/proc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/reboot.h>
#include <sys/sx.h>
diff --git a/freebsd/sys/kern/kern_mtxpool.c b/freebsd/sys/kern/kern_mtxpool.c
index 70ebe84..4b0329b 100644
--- a/freebsd/sys/kern/kern_mtxpool.c
+++ b/freebsd/sys/kern/kern_mtxpool.c
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
#include <sys/proc.h>
#include <sys/kernel.h>
#include <sys/ktr.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/systm.h>
diff --git a/freebsd/sys/kern/kern_osd.c b/freebsd/sys/kern/kern_osd.c
index cd4d322..96e7e5f 100644
--- a/freebsd/sys/kern/kern_osd.c
+++ b/freebsd/sys/kern/kern_osd.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/errno.h>
#include <sys/jail.h>
#include <sys/malloc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/rmlock.h>
#include <sys/sx.h>
diff --git a/freebsd/sys/kern/kern_synch.c b/freebsd/sys/kern/kern_synch.c
index 8bb5607..8b7b9af 100644
--- a/freebsd/sys/kern/kern_synch.c
+++ b/freebsd/sys/kern/kern_synch.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kdb.h>
#include <sys/kernel.h>
#include <sys/ktr.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/resourcevar.h>
diff --git a/freebsd/sys/kern/kern_sysctl.c b/freebsd/sys/kern/kern_sysctl.c
index 6767e48..90b1544 100644
--- a/freebsd/sys/kern/kern_sysctl.c
+++ b/freebsd/sys/kern/kern_sysctl.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
#include <sys/priv.h>
#include <sys/proc.h>
#include <sys/jail.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/rmlock.h>
#include <sys/sbuf.h>
diff --git a/freebsd/sys/kern/kern_time.c b/freebsd/sys/kern/kern_time.c
index 6683173..3ec7167 100644
--- a/freebsd/sys/kern/kern_time.c
+++ b/freebsd/sys/kern/kern_time.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/limits.h>
#include <sys/clock.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/sysproto.h>
#include <sys/eventhandler.h>
diff --git a/freebsd/sys/kern/kern_timeout.c b/freebsd/sys/kern/kern_timeout.c
index 1c76ec2..813580f 100644
--- a/freebsd/sys/kern/kern_timeout.c
+++ b/freebsd/sys/kern/kern_timeout.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
#include <sys/interrupt.h>
#include <sys/kernel.h>
#include <sys/ktr.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/proc.h>
diff --git a/freebsd/sys/kern/kern_uuid.c b/freebsd/sys/kern/kern_uuid.c
index 704125e..b6a8915 100644
--- a/freebsd/sys/kern/kern_uuid.c
+++ b/freebsd/sys/kern/kern_uuid.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/sbuf.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/kern/subr_bus.c b/freebsd/sys/kern/subr_bus.c
index 4a4ceef..e554366 100644
--- a/freebsd/sys/kern/subr_bus.c
+++ b/freebsd/sys/kern/subr_bus.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/filio.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/kernel.h>
#include <sys/kobj.h>
#include <sys/limits.h>
diff --git a/freebsd/sys/kern/subr_counter.c b/freebsd/sys/kern/subr_counter.c
index 1131fd2..685f533 100644
--- a/freebsd/sys/kern/subr_counter.c
+++ b/freebsd/sys/kern/subr_counter.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/sched.h>
diff --git a/freebsd/sys/kern/subr_eventhandler.c b/freebsd/sys/kern/subr_eventhandler.c
index 609e7e8..c373a7f 100644
--- a/freebsd/sys/kern/subr_eventhandler.c
+++ b/freebsd/sys/kern/subr_eventhandler.c
@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/proc.h>
diff --git a/freebsd/sys/kern/subr_firmware.c b/freebsd/sys/kern/subr_firmware.c
index 060b64d..f08a869 100644
--- a/freebsd/sys/kern/subr_firmware.c
+++ b/freebsd/sys/kern/subr_firmware.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/errno.h>
#include <sys/linker.h>
diff --git a/freebsd/sys/kern/subr_hints.c b/freebsd/sys/kern/subr_hints.c
index 052eda6..b19379c 100644
--- a/freebsd/sys/kern/subr_hints.c
+++ b/freebsd/sys/kern/subr_hints.c
@@ -30,7 +30,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/kern/subr_kobj.c b/freebsd/sys/kern/subr_kobj.c
index fe0b389..519630f 100644
--- a/freebsd/sys/kern/subr_kobj.c
+++ b/freebsd/sys/kern/subr_kobj.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/kobj.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/kern/subr_lock.c b/freebsd/sys/kern/subr_lock.c
index 9046f55..6ce4a06 100644
--- a/freebsd/sys/kern/subr_lock.c
+++ b/freebsd/sys/kern/subr_lock.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/ktr.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/lock_profile.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/kern/subr_pcpu.c b/freebsd/sys/kern/subr_pcpu.c
index f83f077..076c302 100644
--- a/freebsd/sys/kern/subr_pcpu.c
+++ b/freebsd/sys/kern/subr_pcpu.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/pcpu.h>
#include <sys/proc.h>
diff --git a/freebsd/sys/kern/subr_prf.c b/freebsd/sys/kern/subr_prf.c
index 3c87da5..2f3efe4 100644
--- a/freebsd/sys/kern/subr_prf.c
+++ b/freebsd/sys/kern/subr_prf.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#ifdef _KERNEL
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/kdb.h>
#include <sys/mutex.h>
#include <sys/sx.h>
diff --git a/freebsd/sys/kern/subr_rman.c b/freebsd/sys/kern/subr_rman.c
index e4e7428..75f22dd 100644
--- a/freebsd/sys/kern/subr_rman.c
+++ b/freebsd/sys/kern/subr_rman.c
@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/limits.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/bus.h> /* XXX debugging */
diff --git a/freebsd/sys/kern/subr_sleepqueue.c b/freebsd/sys/kern/subr_sleepqueue.c
index 215a0fe..35804c0 100644
--- a/freebsd/sys/kern/subr_sleepqueue.c
+++ b/freebsd/sys/kern/subr_sleepqueue.c
@@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/kernel.h>
#include <sys/ktr.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/kern/subr_taskqueue.c b/freebsd/sys/kern/subr_taskqueue.c
index e543d90..6f1ba19 100644
--- a/freebsd/sys/kern/subr_taskqueue.c
+++ b/freebsd/sys/kern/subr_taskqueue.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kthread.h>
#include <sys/libkern.h>
#include <sys/limits.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/proc.h>
diff --git a/freebsd/sys/kern/subr_uio.c b/freebsd/sys/kern/subr_uio.c
index 617dfa9..5740e66 100644
--- a/freebsd/sys/kern/subr_uio.c
+++ b/freebsd/sys/kern/subr_uio.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/limits.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mman.h>
#include <sys/proc.h>
#include <sys/resourcevar.h>
diff --git a/freebsd/sys/kern/subr_unit.c b/freebsd/sys/kern/subr_unit.c
index 1541754..1deeeb8 100644
--- a/freebsd/sys/kern/subr_unit.c
+++ b/freebsd/sys/kern/subr_unit.c
@@ -80,7 +80,7 @@
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/limits.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
/*
diff --git a/freebsd/sys/kern/sys_generic.c b/freebsd/sys/kern/sys_generic.c
index 818fb47..2ee0ae7 100644
--- a/freebsd/sys/kern/sys_generic.c
+++ b/freebsd/sys/kern/sys_generic.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
#include <sys/filio.h>
#include <sys/fcntl.h>
#include <sys/file.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/socketvar.h>
diff --git a/freebsd/sys/kern/sys_pipe.c b/freebsd/sys/kern/sys_pipe.c
index c96caa1..8f010aa 100755
--- a/freebsd/sys/kern/sys_pipe.c
+++ b/freebsd/sys/kern/sys_pipe.c
@@ -104,7 +104,7 @@ __FBSDID("$FreeBSD$");
#include <sys/filedesc.h>
#include <sys/filio.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/ttycom.h>
#include <sys/stat.h>
diff --git a/freebsd/sys/kern/tty_inq.c b/freebsd/sys/kern/tty_inq.c
index 48318e8..8498039 100644
--- a/freebsd/sys/kern/tty_inq.c
+++ b/freebsd/sys/kern/tty_inq.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
diff --git a/freebsd/sys/kern/tty_outq.c b/freebsd/sys/kern/tty_outq.c
index 32a36a1..f083641 100644
--- a/freebsd/sys/kern/tty_outq.c
+++ b/freebsd/sys/kern/tty_outq.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/queue.h>
#include <sys/systm.h>
#include <sys/tty.h>
diff --git a/freebsd/sys/kern/uipc_accf.c b/freebsd/sys/kern/uipc_accf.c
index a691ebe..a766adf 100644
--- a/freebsd/sys/kern/uipc_accf.c
+++ b/freebsd/sys/kern/uipc_accf.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/domain.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/kern/uipc_domain.c b/freebsd/sys/kern/uipc_domain.c
index 03b3b49..93cc3d9 100644
--- a/freebsd/sys/kern/uipc_domain.c
+++ b/freebsd/sys/kern/uipc_domain.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include <sys/eventhandler.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/socketvar.h>
#include <sys/systm.h>
diff --git a/freebsd/sys/kern/uipc_mbuf.c b/freebsd/sys/kern/uipc_mbuf.c
index 4deab1a..ba8a2d4 100644
--- a/freebsd/sys/kern/uipc_mbuf.c
+++ b/freebsd/sys/kern/uipc_mbuf.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/limits.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/kern/uipc_mbuf2.c b/freebsd/sys/kern/uipc_mbuf2.c
index a7c5dac..bb2b27b 100644
--- a/freebsd/sys/kern/uipc_mbuf2.c
+++ b/freebsd/sys/kern/uipc_mbuf2.c
@@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/kern/uipc_sockbuf.c b/freebsd/sys/kern/uipc_sockbuf.c
index 830712a..d6c3b04 100644
--- a/freebsd/sys/kern/uipc_sockbuf.c
+++ b/freebsd/sys/kern/uipc_sockbuf.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/aio.h> /* for aio_swake proto */
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/kern/uipc_socket.c b/freebsd/sys/kern/uipc_socket.c
index 3bc9a1a..5c2ff57 100644
--- a/freebsd/sys/kern/uipc_socket.c
+++ b/freebsd/sys/kern/uipc_socket.c
@@ -113,7 +113,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/fcntl.h>
#include <sys/limits.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mac.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/freebsd/sys/kern/uipc_syscalls.c b/freebsd/sys/kern/uipc_syscalls.c
index 2748df4..fa948c7 100644
--- a/freebsd/sys/kern/uipc_syscalls.c
+++ b/freebsd/sys/kern/uipc_syscalls.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/capsicum.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/sysproto.h>
#include <sys/malloc.h>
diff --git a/freebsd/sys/kern/uipc_usrreq.c b/freebsd/sys/kern/uipc_usrreq.c
index c3094a5..8e60f22 100644
--- a/freebsd/sys/kern/uipc_usrreq.c
+++ b/freebsd/sys/kern/uipc_usrreq.c
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
#include <sys/file.h>
#include <sys/filedesc.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/mount.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/net/altq/if_altq.h b/freebsd/sys/net/altq/if_altq.h
index c5ad287..3dcc96c 100644
--- a/freebsd/sys/net/altq/if_altq.h
+++ b/freebsd/sys/net/altq/if_altq.h
@@ -29,7 +29,7 @@
#ifndef _ALTQ_IF_ALTQ_H_
#define _ALTQ_IF_ALTQ_H_
-#include <rtems/bsd/sys/lock.h> /* XXX */
+#include <sys/lock.h> /* XXX */
#include <sys/mutex.h> /* XXX */
#include <sys/event.h> /* XXX */
diff --git a/freebsd/sys/net/bpf.c b/freebsd/sys/net/bpf.c
index 5b744f7..48c01a0 100644
--- a/freebsd/sys/net/bpf.c
+++ b/freebsd/sys/net/bpf.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/systm.h>
#include <sys/conf.h>
diff --git a/freebsd/sys/net/bridgestp.c b/freebsd/sys/net/bridgestp.c
index a0e5cca..dfa2a9b 100644
--- a/freebsd/sys/net/bridgestp.c
+++ b/freebsd/sys/net/bridgestp.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#include <sys/callout.h>
#include <sys/module.h>
#include <sys/proc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/taskqueue.h>
diff --git a/freebsd/sys/net/ieee8023ad_lacp.c b/freebsd/sys/net/ieee8023ad_lacp.c
index 3e1e676..74e68be 100644
--- a/freebsd/sys/net/ieee8023ad_lacp.c
+++ b/freebsd/sys/net/ieee8023ad_lacp.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sockio.h>
#include <sys/sysctl.h>
#include <machine/stdarg.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/taskqueue.h>
diff --git a/freebsd/sys/net/if.c b/freebsd/sys/net/if.c
index 8198990..9e76548 100644
--- a/freebsd/sys/net/if.c
+++ b/freebsd/sys/net/if.c
@@ -50,7 +50,7 @@
#include <sys/socketvar.h>
#include <sys/protosw.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/refcount.h>
#include <sys/module.h>
#include <sys/rwlock.h>
diff --git a/freebsd/sys/net/if_bridge.c b/freebsd/sys/net/if_bridge.c
index f49cad9..d0cd7fd 100644
--- a/freebsd/sys/net/if_bridge.c
+++ b/freebsd/sys/net/if_bridge.c
@@ -101,7 +101,7 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/priv.h>
#include <sys/proc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <net/bpf.h>
diff --git a/freebsd/sys/net/if_clone.c b/freebsd/sys/net/if_clone.c
index cb888f0..e733942 100644
--- a/freebsd/sys/net/if_clone.c
+++ b/freebsd/sys/net/if_clone.c
@@ -37,7 +37,7 @@
#include <sys/eventhandler.h>
#include <sys/malloc.h>
#include <sys/limits.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/kernel.h>
#include <sys/systm.h>
diff --git a/freebsd/sys/net/if_ethersubr.c b/freebsd/sys/net/if_ethersubr.c
index 9a52df9..7deecb6 100644
--- a/freebsd/sys/net/if_ethersubr.c
+++ b/freebsd/sys/net/if_ethersubr.c
@@ -41,7 +41,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mbuf.h>
diff --git a/freebsd/sys/net/if_gif.c b/freebsd/sys/net/if_gif.c
index 098fb30..e5e6cb5 100644
--- a/freebsd/sys/net/if_gif.c
+++ b/freebsd/sys/net/if_gif.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/jail.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/net/if_gre.c b/freebsd/sys/net/if_gre.c
index f0243b0..5593138 100644
--- a/freebsd/sys/net/if_gre.c
+++ b/freebsd/sys/net/if_gre.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/libkern.h>
#include <sys/malloc.h>
#include <sys/module.h>
diff --git a/freebsd/sys/net/if_lagg.c b/freebsd/sys/net/if_lagg.c
index 3978b50..78507ff 100644
--- a/freebsd/sys/net/if_lagg.c
+++ b/freebsd/sys/net/if_lagg.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
#include <sys/priv.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
#include <sys/taskqueue.h>
#include <sys/eventhandler.h>
diff --git a/freebsd/sys/net/if_llatbl.c b/freebsd/sys/net/if_llatbl.c
index 604bba3..7de52a7 100644
--- a/freebsd/sys/net/if_llatbl.c
+++ b/freebsd/sys/net/if_llatbl.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <sys/socket.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/rwlock.h>
diff --git a/freebsd/sys/net/if_spppsubr.c b/freebsd/sys/net/if_spppsubr.c
index 1cb8a09..306b7e2 100644
--- a/freebsd/sys/net/if_spppsubr.c
+++ b/freebsd/sys/net/if_spppsubr.c
@@ -30,7 +30,7 @@
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/module.h>
#include <sys/rmlock.h>
#include <sys/sockio.h>
diff --git a/freebsd/sys/net/if_stf.c b/freebsd/sys/net/if_stf.c
index db07f93..719dd1f 100644
--- a/freebsd/sys/net/if_stf.c
+++ b/freebsd/sys/net/if_stf.c
@@ -83,7 +83,7 @@
#include <sys/mbuf.h>
#include <sys/errno.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/module.h>
#include <sys/protosw.h>
#include <sys/proc.h>
diff --git a/freebsd/sys/net/if_var.h b/freebsd/sys/net/if_var.h
index 4d93ed7..e5d5c76 100644
--- a/freebsd/sys/net/if_var.h
+++ b/freebsd/sys/net/if_var.h
@@ -75,7 +75,7 @@ struct netmap_adapter;
#include <net/vnet.h>
#endif /* _KERNEL */
#include <sys/counter.h>
-#include <rtems/bsd/sys/lock.h> /* XXX */
+#include <sys/lock.h> /* XXX */
#include <sys/mutex.h> /* struct ifqueue */
#include <sys/rwlock.h> /* XXX */
#include <sys/sx.h> /* XXX */
diff --git a/freebsd/sys/net/if_vlan.c b/freebsd/sys/net/if_vlan.c
index 46e1eee..5db11c4 100644
--- a/freebsd/sys/net/if_vlan.c
+++ b/freebsd/sys/net/if_vlan.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/eventhandler.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/net/ifq.h b/freebsd/sys/net/ifq.h
index 678b62f..3969c6a 100644
--- a/freebsd/sys/net/ifq.h
+++ b/freebsd/sys/net/ifq.h
@@ -38,7 +38,7 @@
#include <sys/buf_ring.h>
#include <net/vnet.h>
#endif /* _KERNEL */
-#include <rtems/bsd/sys/lock.h> /* XXX */
+#include <sys/lock.h> /* XXX */
#include <sys/mutex.h> /* struct ifqueue */
/*
diff --git a/freebsd/sys/net/netisr.c b/freebsd/sys/net/netisr.c
index 2803fad..5dffbfd 100644
--- a/freebsd/sys/net/netisr.c
+++ b/freebsd/sys/net/netisr.c
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kthread.h>
#include <sys/malloc.h>
#include <sys/interrupt.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
#include <sys/pcpu.h>
diff --git a/freebsd/sys/net/pfil.c b/freebsd/sys/net/pfil.c
index 4ea1bfc..3c7984c 100644
--- a/freebsd/sys/net/pfil.c
+++ b/freebsd/sys/net/pfil.c
@@ -34,14 +34,14 @@
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/errno.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/rmlock.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/systm.h>
#include <sys/condvar.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/queue.h>
diff --git a/freebsd/sys/net/pfil.h b/freebsd/sys/net/pfil.h
index aee40e8..64d7cf6 100644
--- a/freebsd/sys/net/pfil.h
+++ b/freebsd/sys/net/pfil.h
@@ -36,7 +36,7 @@
#include <sys/queue.h>
#include <sys/_lock.h>
#include <sys/_mutex.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
#include <net/vnet.h>
diff --git a/freebsd/sys/net/radix.c b/freebsd/sys/net/radix.c
index f423bb7..6bca1a1 100644
--- a/freebsd/sys/net/radix.c
+++ b/freebsd/sys/net/radix.c
@@ -37,7 +37,7 @@
*/
#include <sys/param.h>
#ifdef _KERNEL
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/rwlock.h>
#include <sys/systm.h>
diff --git a/freebsd/sys/net/raw_cb.c b/freebsd/sys/net/raw_cb.c
index 371752a..dd89344 100644
--- a/freebsd/sys/net/raw_cb.c
+++ b/freebsd/sys/net/raw_cb.c
@@ -35,7 +35,7 @@
#include <sys/param.h>
#include <sys/domain.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/net/raw_usrreq.c b/freebsd/sys/net/raw_usrreq.c
index 03e6500..ff89cf5 100644
--- a/freebsd/sys/net/raw_usrreq.c
+++ b/freebsd/sys/net/raw_usrreq.c
@@ -35,7 +35,7 @@
#include <sys/param.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/net/rtsock.c b/freebsd/sys/net/rtsock.c
index ec13457..d8835e8 100644
--- a/freebsd/sys/net/rtsock.c
+++ b/freebsd/sys/net/rtsock.c
@@ -40,7 +40,7 @@
#include <sys/jail.h>
#include <sys/kernel.h>
#include <sys/domain.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/priv.h>
diff --git a/freebsd/sys/net/vnet.h b/freebsd/sys/net/vnet.h
index 3e186c1..4985d4b 100644
--- a/freebsd/sys/net/vnet.h
+++ b/freebsd/sys/net/vnet.h
@@ -142,7 +142,7 @@ SYSCTL_PROC(parent, nbr, name, CTLFLAG_VNET | CTLTYPE_OPAQUE | CTLFLAG_RW, \
#endif /* SYSCTL_OID */
#ifdef VIMAGE
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/proc.h> /* for struct thread */
#include <sys/rwlock.h>
#include <sys/sx.h>
diff --git a/freebsd/sys/net80211/ieee80211_freebsd.h b/freebsd/sys/net80211/ieee80211_freebsd.h
index 40d32b7..2a0b739 100644
--- a/freebsd/sys/net80211/ieee80211_freebsd.h
+++ b/freebsd/sys/net80211/ieee80211_freebsd.h
@@ -31,7 +31,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/counter.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/rwlock.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/netinet/cc/cc.c b/freebsd/sys/netinet/cc/cc.c
index 3cd0ef7..26d6f32 100644
--- a/freebsd/sys/netinet/cc/cc.c
+++ b/freebsd/sys/netinet/cc/cc.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/libkern.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/netinet/if_ether.c b/freebsd/sys/netinet/if_ether.c
index fd4ae62..802fedb 100644
--- a/freebsd/sys/netinet/if_ether.c
+++ b/freebsd/sys/netinet/if_ether.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
diff --git a/freebsd/sys/netinet/igmp.c b/freebsd/sys/netinet/igmp.c
index cd41e78..5575a80 100644
--- a/freebsd/sys/netinet/igmp.c
+++ b/freebsd/sys/netinet/igmp.c
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
#include <sys/socket.h>
#include <sys/protosw.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
#include <sys/sysctl.h>
#include <sys/ktr.h>
diff --git a/freebsd/sys/netinet/in.c b/freebsd/sys/netinet/in.c
index 48768f9..ca902fd 100644
--- a/freebsd/sys/netinet/in.c
+++ b/freebsd/sys/netinet/in.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/socket.h>
#include <sys/jail.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/rmlock.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/netinet/in_fib.c b/freebsd/sys/netinet/in_fib.c
index 323821b..f62bc4a 100644
--- a/freebsd/sys/netinet/in_fib.c
+++ b/freebsd/sys/netinet/in_fib.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/freebsd/sys/netinet/in_gif.c b/freebsd/sys/netinet/in_gif.c
index b994de8..e7439ac 100644
--- a/freebsd/sys/netinet/in_gif.c
+++ b/freebsd/sys/netinet/in_gif.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_inet6.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
#include <sys/systm.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netinet/in_mcast.c b/freebsd/sys/netinet/in_mcast.c
index f4ea91a..cb92a25 100644
--- a/freebsd/sys/netinet/in_mcast.c
+++ b/freebsd/sys/netinet/in_mcast.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
diff --git a/freebsd/sys/netinet/in_pcb.c b/freebsd/sys/netinet/in_pcb.c
index 677cdb8..b61b6e0 100644
--- a/freebsd/sys/netinet/in_pcb.c
+++ b/freebsd/sys/netinet/in_pcb.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/callout.h>
diff --git a/freebsd/sys/netinet/in_pcb.h b/freebsd/sys/netinet/in_pcb.h
index a3bd23d..59de3b0 100644
--- a/freebsd/sys/netinet/in_pcb.h
+++ b/freebsd/sys/netinet/in_pcb.h
@@ -45,7 +45,7 @@
#include <net/route.h>
#ifdef _KERNEL
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <net/vnet.h>
#include <vm/uma.h>
diff --git a/freebsd/sys/netinet/ip_divert.c b/freebsd/sys/netinet/ip_divert.c
index 854e25e..3efae68 100644
--- a/freebsd/sys/netinet/ip_divert.c
+++ b/freebsd/sys/netinet/ip_divert.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/eventhandler.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/netinet/ip_encap.c b/freebsd/sys/netinet/ip_encap.c
index f55fed9..0f6fa85 100644
--- a/freebsd/sys/netinet/ip_encap.c
+++ b/freebsd/sys/netinet/ip_encap.c
@@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/socket.h>
#include <sys/sockio.h>
diff --git a/freebsd/sys/netinet/ip_gre.c b/freebsd/sys/netinet/ip_gre.c
index e7738a6..90c2203 100644
--- a/freebsd/sys/netinet/ip_gre.c
+++ b/freebsd/sys/netinet/ip_gre.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
#include <sys/sysctl.h>
#include <net/ethernet.h>
diff --git a/freebsd/sys/netinet/ip_icmp.c b/freebsd/sys/netinet/ip_icmp.c
index d74b13f..1c32b1b 100644
--- a/freebsd/sys/netinet/ip_icmp.c
+++ b/freebsd/sys/netinet/ip_icmp.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
#include <sys/sysctl.h>
#include <sys/syslog.h>
diff --git a/freebsd/sys/netinet/ip_id.c b/freebsd/sys/netinet/ip_id.c
index 4119565..fb7d783 100644
--- a/freebsd/sys/netinet/ip_id.c
+++ b/freebsd/sys/netinet/ip_id.c
@@ -81,7 +81,7 @@ __FBSDID("$FreeBSD$");
#include <sys/counter.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/random.h>
#include <sys/smp.h>
diff --git a/freebsd/sys/netinet/ip_input.c b/freebsd/sys/netinet/ip_input.c
index 05a40a3..a9126d4 100644
--- a/freebsd/sys/netinet/ip_input.c
+++ b/freebsd/sys/netinet/ip_input.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
#include <sys/rwlock.h>
#include <sys/sdt.h>
diff --git a/freebsd/sys/netinet/ip_mroute.c b/freebsd/sys/netinet/ip_mroute.c
index 7859bd9..d0d323e 100644
--- a/freebsd/sys/netinet/ip_mroute.c
+++ b/freebsd/sys/netinet/ip_mroute.c
@@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/stddef.h>
#include <sys/eventhandler.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/ktr.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/freebsd/sys/netinet/ip_output.c b/freebsd/sys/netinet/ip_output.c
index 256173c..234f19f 100644
--- a/freebsd/sys/netinet/ip_output.c
+++ b/freebsd/sys/netinet/ip_output.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/priv.h>
diff --git a/freebsd/sys/netinet/ip_reass.c b/freebsd/sys/netinet/ip_reass.c
index bf46a72..30cf3ba 100644
--- a/freebsd/sys/netinet/ip_reass.c
+++ b/freebsd/sys/netinet/ip_reass.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#include <sys/hash.h>
#include <sys/mbuf.h>
#include <sys/malloc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/netinet/libalias/alias_db.c b/freebsd/sys/netinet/libalias/alias_db.c
index 9040273..212b891 100644
--- a/freebsd/sys/netinet/libalias/alias_db.c
+++ b/freebsd/sys/netinet/libalias/alias_db.c
@@ -149,7 +149,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/module.h>
#include <sys/rwlock.h>
#include <sys/syslog.h>
diff --git a/freebsd/sys/netinet/libalias/alias_local.h b/freebsd/sys/netinet/libalias/alias_local.h
index 873ea11..e9e843c 100644
--- a/freebsd/sys/netinet/libalias/alias_local.h
+++ b/freebsd/sys/netinet/libalias/alias_local.h
@@ -52,7 +52,7 @@
#ifdef _KERNEL
#include <sys/malloc.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
/* XXX: LibAliasSetTarget() uses this constant. */
diff --git a/freebsd/sys/netinet/libalias/alias_mod.c b/freebsd/sys/netinet/libalias/alias_mod.c
index d6f60ac..d57d9ca 100644
--- a/freebsd/sys/netinet/libalias/alias_mod.c
+++ b/freebsd/sys/netinet/libalias/alias_mod.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
#ifdef _KERNEL
#include <sys/libkern.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#else
#include <stdio.h>
diff --git a/freebsd/sys/netinet/raw_ip.c b/freebsd/sys/netinet/raw_ip.c
index 5a615a0..d67df1c 100644
--- a/freebsd/sys/netinet/raw_ip.c
+++ b/freebsd/sys/netinet/raw_ip.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <sys/jail.h>
#include <sys/kernel.h>
#include <sys/eventhandler.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/priv.h>
diff --git a/freebsd/sys/netinet/sctp_os_bsd.h b/freebsd/sys/netinet/sctp_os_bsd.h
index 8ddb480..2da90b6 100644
--- a/freebsd/sys/netinet/sctp_os_bsd.h
+++ b/freebsd/sys/netinet/sctp_os_bsd.h
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <sys/resourcevar.h>
#include <sys/uio.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/kthread.h>
#include <sys/priv.h>
diff --git a/freebsd/sys/netinet/tcp_debug.c b/freebsd/sys/netinet/tcp_debug.c
index 03eba1d..8835370 100644
--- a/freebsd/sys/netinet/tcp_debug.c
+++ b/freebsd/sys/netinet/tcp_debug.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
#include <sys/protosw.h>
diff --git a/freebsd/sys/netinet/tcp_hostcache.c b/freebsd/sys/netinet/tcp_hostcache.c
index 02462fa..0452f5d 100644
--- a/freebsd/sys/netinet/tcp_hostcache.c
+++ b/freebsd/sys/netinet/tcp_hostcache.c
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/jail.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/malloc.h>
#include <sys/proc.h>
diff --git a/freebsd/sys/netinet/tcp_output.c b/freebsd/sys/netinet/tcp_output.c
index 6ecc0cc..53eccf1 100644
--- a/freebsd/sys/netinet/tcp_output.c
+++ b/freebsd/sys/netinet/tcp_output.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/hhook.h>
#endif
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
#include <sys/protosw.h>
diff --git a/freebsd/sys/netinet/tcp_syncache.c b/freebsd/sys/netinet/tcp_syncache.c
index 05e076f..84b9d27 100644
--- a/freebsd/sys/netinet/tcp_syncache.c
+++ b/freebsd/sys/netinet/tcp_syncache.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/limits.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/freebsd/sys/netinet/tcp_timer.c b/freebsd/sys/netinet/tcp_timer.c
index 7e7836a..ebd9e85 100644
--- a/freebsd/sys/netinet/tcp_timer.c
+++ b/freebsd/sys/netinet/tcp_timer.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
#include <sys/protosw.h>
diff --git a/freebsd/sys/netinet/udp_usrreq.c b/freebsd/sys/netinet/udp_usrreq.c
index 44be4d5..c77439f 100644
--- a/freebsd/sys/netinet/udp_usrreq.c
+++ b/freebsd/sys/netinet/udp_usrreq.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#include <sys/eventhandler.h>
#include <sys/jail.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/priv.h>
diff --git a/freebsd/sys/netinet6/icmp6.c b/freebsd/sys/netinet6/icmp6.c
index d9f8499..0b9eeb0 100644
--- a/freebsd/sys/netinet6/icmp6.c
+++ b/freebsd/sys/netinet6/icmp6.c
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
#include <sys/domain.h>
#include <sys/jail.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/proc.h>
diff --git a/freebsd/sys/netinet6/in6.c b/freebsd/sys/netinet6/in6.c
index 9124fa7..d5c2139 100644
--- a/freebsd/sys/netinet6/in6.c
+++ b/freebsd/sys/netinet6/in6.c
@@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$");
#include <sys/proc.h>
#include <sys/time.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
#include <sys/syslog.h>
diff --git a/freebsd/sys/netinet6/in6_fib.c b/freebsd/sys/netinet6/in6_fib.c
index 8bc60fa..cf79797 100644
--- a/freebsd/sys/netinet6/in6_fib.c
+++ b/freebsd/sys/netinet6/in6_fib.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/freebsd/sys/netinet6/in6_gif.c b/freebsd/sys/netinet6/in6_gif.c
index 66da8fd..70de4d0 100644
--- a/freebsd/sys/netinet6/in6_gif.c
+++ b/freebsd/sys/netinet6/in6_gif.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_inet6.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
#include <sys/systm.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netinet6/in6_ifattach.c b/freebsd/sys/netinet6/in6_ifattach.c
index e312108..e572fad 100644
--- a/freebsd/sys/netinet6/in6_ifattach.c
+++ b/freebsd/sys/netinet6/in6_ifattach.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sockio.h>
#include <sys/jail.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/rmlock.h>
#include <sys/syslog.h>
diff --git a/freebsd/sys/netinet6/in6_rmx.c b/freebsd/sys/netinet6/in6_rmx.c
index 88e6bd2..d6d9efe 100644
--- a/freebsd/sys/netinet6/in6_rmx.c
+++ b/freebsd/sys/netinet6/in6_rmx.c
@@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
diff --git a/freebsd/sys/netinet6/in6_src.c b/freebsd/sys/netinet6/in6_src.c
index 2d7d05f..bc6890d 100644
--- a/freebsd/sys/netinet6/in6_src.c
+++ b/freebsd/sys/netinet6/in6_src.c
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/priv.h>
diff --git a/freebsd/sys/netinet6/ip6_input.c b/freebsd/sys/netinet6/ip6_input.c
index fed16c0..3d50267 100644
--- a/freebsd/sys/netinet6/ip6_input.c
+++ b/freebsd/sys/netinet6/ip6_input.c
@@ -85,7 +85,7 @@ __FBSDID("$FreeBSD$");
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
#include <sys/syslog.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/netinet6/ip6_mroute.c b/freebsd/sys/netinet6/ip6_mroute.c
index 139db2b..a1d7136 100644
--- a/freebsd/sys/netinet6/ip6_mroute.c
+++ b/freebsd/sys/netinet6/ip6_mroute.c
@@ -89,7 +89,7 @@ __FBSDID("$FreeBSD$");
#include <sys/callout.h>
#include <sys/errno.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/netinet6/nd6.c b/freebsd/sys/netinet6/nd6.c
index 488389d..b636896 100644
--- a/freebsd/sys/netinet6/nd6.c
+++ b/freebsd/sys/netinet6/nd6.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/callout.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/netinet6/nd6_nbr.c b/freebsd/sys/netinet6/nd6_nbr.c
index 95c2ab1..f22d0ce 100644
--- a/freebsd/sys/netinet6/nd6_nbr.c
+++ b/freebsd/sys/netinet6/nd6_nbr.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/libkern.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netinet6/nd6_rtr.c b/freebsd/sys/netinet6/nd6_rtr.c
index 4b1c6ba..7edd092 100644
--- a/freebsd/sys/netinet6/nd6_rtr.c
+++ b/freebsd/sys/netinet6/nd6_rtr.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sockio.h>
#include <sys/time.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/errno.h>
#include <sys/rmlock.h>
#include <sys/rwlock.h>
diff --git a/freebsd/sys/netinet6/raw_ip6.c b/freebsd/sys/netinet6/raw_ip6.c
index b03bae7..ed29419 100644
--- a/freebsd/sys/netinet6/raw_ip6.c
+++ b/freebsd/sys/netinet6/raw_ip6.c
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
#include <sys/errno.h>
#include <sys/jail.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/priv.h>
diff --git a/freebsd/sys/netinet6/udp6_usrreq.c b/freebsd/sys/netinet6/udp6_usrreq.c
index 5abd99e..bc6596e 100644
--- a/freebsd/sys/netinet6/udp6_usrreq.c
+++ b/freebsd/sys/netinet6/udp6_usrreq.c
@@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/priv.h>
#include <sys/proc.h>
diff --git a/freebsd/sys/netipsec/ipsec_mod.c b/freebsd/sys/netipsec/ipsec_mod.c
index 32f6cc4..18075fd 100644
--- a/freebsd/sys/netipsec/ipsec_mod.c
+++ b/freebsd/sys/netipsec/ipsec_mod.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/netipsec/ipsec_pcb.c b/freebsd/sys/netipsec/ipsec_pcb.c
index 5822185..8a08e3a 100644
--- a/freebsd/sys/netipsec/ipsec_pcb.c
+++ b/freebsd/sys/netipsec/ipsec_pcb.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/priv.h>
diff --git a/freebsd/sys/netipsec/key.c b/freebsd/sys/netipsec/key.c
index bf4eb9d..c0edde4 100644
--- a/freebsd/sys/netipsec/key.c
+++ b/freebsd/sys/netipsec/key.c
@@ -45,7 +45,7 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/fnv_hash.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
#include <sys/domain.h>
diff --git a/freebsd/sys/netipsec/key_debug.c b/freebsd/sys/netipsec/key_debug.c
index 362b552..016ed73 100644
--- a/freebsd/sys/netipsec/key_debug.c
+++ b/freebsd/sys/netipsec/key_debug.c
@@ -41,7 +41,7 @@
#include <sys/param.h>
#ifdef _KERNEL
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/netipsec/keydb.h b/freebsd/sys/netipsec/keydb.h
index e365014..ab03abb 100644
--- a/freebsd/sys/netipsec/keydb.h
+++ b/freebsd/sys/netipsec/keydb.h
@@ -35,7 +35,7 @@
#ifdef _KERNEL
#include <sys/counter.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <netipsec/key_var.h>
diff --git a/freebsd/sys/netipsec/keysock.c b/freebsd/sys/netipsec/keysock.c
index 12fecfa..a7421af 100644
--- a/freebsd/sys/netipsec/keysock.c
+++ b/freebsd/sys/netipsec/keysock.c
@@ -41,7 +41,7 @@
#include <sys/domain.h>
#include <sys/errno.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/netipsec/subr_ipsec.c b/freebsd/sys/netipsec/subr_ipsec.c
index cf6b317..1ddae59 100644
--- a/freebsd/sys/netipsec/subr_ipsec.c
+++ b/freebsd/sys/netipsec/subr_ipsec.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/netipsec/udpencap.c b/freebsd/sys/netipsec/udpencap.c
index fbf9ae6..265461c 100644
--- a/freebsd/sys/netipsec/udpencap.c
+++ b/freebsd/sys/netipsec/udpencap.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netipsec/xform_ah.c b/freebsd/sys/netipsec/xform_ah.c
index d08089c..f8bbd3c 100644
--- a/freebsd/sys/netipsec/xform_ah.c
+++ b/freebsd/sys/netipsec/xform_ah.c
@@ -47,7 +47,7 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/netipsec/xform_esp.c b/freebsd/sys/netipsec/xform_esp.c
index ebd1823..6b79d25 100644
--- a/freebsd/sys/netipsec/xform_esp.c
+++ b/freebsd/sys/netipsec/xform_esp.c
@@ -46,7 +46,7 @@
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/random.h>
#include <sys/mutex.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/netipsec/xform_ipcomp.c b/freebsd/sys/netipsec/xform_ipcomp.c
index 6b11d80..c232716 100644
--- a/freebsd/sys/netipsec/xform_ipcomp.c
+++ b/freebsd/sys/netipsec/xform_ipcomp.c
@@ -37,7 +37,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/socket.h>
#include <sys/kernel.h>
diff --git a/freebsd/sys/netipsec/xform_tcp.c b/freebsd/sys/netipsec/xform_tcp.c
index 7306a50..3df5db3 100644
--- a/freebsd/sys/netipsec/xform_tcp.c
+++ b/freebsd/sys/netipsec/xform_tcp.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/md5.h>
#include <sys/rmlock.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_fw2.c b/freebsd/sys/netpfil/ipfw/ip_fw2.c
index 42ba575..8e51bd8 100644
--- a/freebsd/sys/netpfil/ipfw/ip_fw2.c
+++ b/freebsd/sys/netpfil/ipfw/ip_fw2.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/jail.h>
#include <sys/module.h>
#include <sys/priv.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_bpf.c b/freebsd/sys/netpfil/ipfw/ip_fw_bpf.c
index fed39f8..a204fdd 100644
--- a/freebsd/sys/netpfil/ipfw/ip_fw_bpf.c
+++ b/freebsd/sys/netpfil/ipfw/ip_fw_bpf.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
#include <sys/socket.h>
#include <net/ethernet.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_dynamic.c b/freebsd/sys/netpfil/ipfw/ip_fw_dynamic.c
index 11661e8..b5a90f5 100644
--- a/freebsd/sys/netpfil/ipfw/ip_fw_dynamic.c
+++ b/freebsd/sys/netpfil/ipfw/ip_fw_dynamic.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/ktr.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
#include <sys/socket.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_eaction.c b/freebsd/sys/netpfil/ipfw/ip_fw_eaction.c
index dc207a2..25f1b35 100644
--- a/freebsd/sys/netpfil/ipfw/ip_fw_eaction.c
+++ b/freebsd/sys/netpfil/ipfw/ip_fw_eaction.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/hash.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/rmlock.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_iface.c b/freebsd/sys/netpfil/ipfw/ip_fw_iface.c
index 5a7411d..d7f8eb2 100644
--- a/freebsd/sys/netpfil/ipfw/ip_fw_iface.c
+++ b/freebsd/sys/netpfil/ipfw/ip_fw_iface.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/rmlock.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_nat.c b/freebsd/sys/netpfil/ipfw/ip_fw_nat.c
index 0c3d6c5..77c5579 100644
--- a/freebsd/sys/netpfil/ipfw/ip_fw_nat.c
+++ b/freebsd/sys/netpfil/ipfw/ip_fw_nat.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/module.h>
#include <sys/rwlock.h>
#include <sys/rmlock.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_pfil.c b/freebsd/sys/netpfil/ipfw/ip_fw_pfil.c
index 85fc3a6..d6d5ccb 100644
--- a/freebsd/sys/netpfil/ipfw/ip_fw_pfil.c
+++ b/freebsd/sys/netpfil/ipfw/ip_fw_pfil.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
#include <sys/mbuf.h>
#include <sys/module.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/socket.h>
#include <sys/sysctl.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_sockopt.c b/freebsd/sys/netpfil/ipfw/ip_fw_sockopt.c
index fae86e1..1acba1c 100644
--- a/freebsd/sys/netpfil/ipfw/ip_fw_sockopt.c
+++ b/freebsd/sys/netpfil/ipfw/ip_fw_sockopt.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/mbuf.h> /* struct m_tag used by nested headers */
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/priv.h>
#include <sys/proc.h>
#include <sys/rwlock.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_table.c b/freebsd/sys/netpfil/ipfw/ip_fw_table.c
index 29e62a4..828d437 100644
--- a/freebsd/sys/netpfil/ipfw/ip_fw_table.c
+++ b/freebsd/sys/netpfil/ipfw/ip_fw_table.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/rmlock.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_table_algo.c b/freebsd/sys/netpfil/ipfw/ip_fw_table_algo.c
index 6ba8254..2cf0bdc 100644
--- a/freebsd/sys/netpfil/ipfw/ip_fw_table_algo.c
+++ b/freebsd/sys/netpfil/ipfw/ip_fw_table_algo.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/rmlock.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_fw_table_value.c b/freebsd/sys/netpfil/ipfw/ip_fw_table_value.c
index fe905e2..d9228f6 100644
--- a/freebsd/sys/netpfil/ipfw/ip_fw_table_value.c
+++ b/freebsd/sys/netpfil/ipfw/ip_fw_table_value.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/hash.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/rmlock.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netpfil/ipfw/nat64/ip_fw_nat64.c b/freebsd/sys/netpfil/ipfw/nat64/ip_fw_nat64.c
index 8e25fe6..0af8d7c 100644
--- a/freebsd/sys/netpfil/ipfw/nat64/ip_fw_nat64.c
+++ b/freebsd/sys/netpfil/ipfw/nat64/ip_fw_nat64.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/rwlock.h>
diff --git a/freebsd/sys/netpfil/ipfw/nat64/nat64_translate.c b/freebsd/sys/netpfil/ipfw/nat64/nat64_translate.c
index e7ffb0b..142d19a 100644
--- a/freebsd/sys/netpfil/ipfw/nat64/nat64_translate.c
+++ b/freebsd/sys/netpfil/ipfw/nat64/nat64_translate.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
#include <sys/counter.h>
#include <sys/errno.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/module.h>
#include <sys/rmlock.h>
diff --git a/freebsd/sys/netpfil/ipfw/nat64/nat64lsn.c b/freebsd/sys/netpfil/ipfw/nat64/nat64lsn.c
index 67d31e6..c058fe8 100644
--- a/freebsd/sys/netpfil/ipfw/nat64/nat64lsn.c
+++ b/freebsd/sys/netpfil/ipfw/nat64/nat64lsn.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/counter.h>
#include <sys/errno.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/netpfil/ipfw/nat64/nat64lsn_control.c b/freebsd/sys/netpfil/ipfw/nat64/nat64lsn_control.c
index 8986923..f8278c0 100644
--- a/freebsd/sys/netpfil/ipfw/nat64/nat64lsn_control.c
+++ b/freebsd/sys/netpfil/ipfw/nat64/nat64lsn_control.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/counter.h>
#include <sys/errno.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/netpfil/ipfw/nat64/nat64stl.c b/freebsd/sys/netpfil/ipfw/nat64/nat64stl.c
index 662b634..8419b6d 100644
--- a/freebsd/sys/netpfil/ipfw/nat64/nat64stl.c
+++ b/freebsd/sys/netpfil/ipfw/nat64/nat64stl.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/counter.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/module.h>
#include <sys/rmlock.h>
diff --git a/freebsd/sys/netpfil/ipfw/nat64/nat64stl_control.c b/freebsd/sys/netpfil/ipfw/nat64/nat64stl_control.c
index 851c5b0..b5e6e03 100644
--- a/freebsd/sys/netpfil/ipfw/nat64/nat64stl_control.c
+++ b/freebsd/sys/netpfil/ipfw/nat64/nat64stl_control.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/counter.h>
#include <sys/errno.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/netpfil/ipfw/nptv6/ip_fw_nptv6.c b/freebsd/sys/netpfil/ipfw/nptv6/ip_fw_nptv6.c
index ebedf33..2746bed 100644
--- a/freebsd/sys/netpfil/ipfw/nptv6/ip_fw_nptv6.c
+++ b/freebsd/sys/netpfil/ipfw/nptv6/ip_fw_nptv6.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/rwlock.h>
diff --git a/freebsd/sys/netpfil/ipfw/nptv6/nptv6.c b/freebsd/sys/netpfil/ipfw/nptv6/nptv6.c
index 536c683..a41e00f 100644
--- a/freebsd/sys/netpfil/ipfw/nptv6/nptv6.c
+++ b/freebsd/sys/netpfil/ipfw/nptv6/nptv6.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
#include <sys/counter.h>
#include <sys/errno.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
diff --git a/freebsd/sys/netpfil/pf/if_pfsync.c b/freebsd/sys/netpfil/pf/if_pfsync.c
index b7b00d9..491ff3a 100644
--- a/freebsd/sys/netpfil/pf/if_pfsync.c
+++ b/freebsd/sys/netpfil/pf/if_pfsync.c
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
#include <sys/endian.h>
#include <sys/interrupt.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/module.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/netpfil/pf/pf_if.c b/freebsd/sys/netpfil/pf/pf_if.c
index 80ff255..fbcda5b 100644
--- a/freebsd/sys/netpfil/pf/pf_if.c
+++ b/freebsd/sys/netpfil/pf/pf_if.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/eventhandler.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/rwlock.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netpfil/pf/pf_ioctl.c b/freebsd/sys/netpfil/pf/pf_ioctl.c
index 4779477..4f50708 100644
--- a/freebsd/sys/netpfil/pf/pf_ioctl.c
+++ b/freebsd/sys/netpfil/pf/pf_ioctl.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#include <sys/jail.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/module.h>
#include <sys/proc.h>
diff --git a/freebsd/sys/netpfil/pf/pf_lb.c b/freebsd/sys/netpfil/pf/pf_lb.c
index c6e616b..8d43766 100644
--- a/freebsd/sys/netpfil/pf/pf_lb.c
+++ b/freebsd/sys/netpfil/pf/pf_lb.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#include <rtems/bsd/local/opt_inet6.h>
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/rwlock.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netpfil/pf/pf_norm.c b/freebsd/sys/netpfil/pf/pf_norm.c
index 7134d47..f4d4637 100644
--- a/freebsd/sys/netpfil/pf/pf_norm.c
+++ b/freebsd/sys/netpfil/pf/pf_norm.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
#include <sys/refcount.h>
diff --git a/freebsd/sys/netpfil/pf/pf_osfp.c b/freebsd/sys/netpfil/pf/pf_osfp.c
index 8202a38..7b55d20 100644
--- a/freebsd/sys/netpfil/pf/pf_osfp.c
+++ b/freebsd/sys/netpfil/pf/pf_osfp.c
@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mbuf.h>
#include <sys/rwlock.h>
#include <sys/socket.h>
diff --git a/freebsd/sys/netpfil/pf/pf_table.c b/freebsd/sys/netpfil/pf/pf_table.c
index 1999c63..3460046 100644
--- a/freebsd/sys/netpfil/pf/pf_table.c
+++ b/freebsd/sys/netpfil/pf/pf_table.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
diff --git a/freebsd/sys/opencrypto/crypto.c b/freebsd/sys/opencrypto/crypto.c
index 5fa2aa6..45622c3 100644
--- a/freebsd/sys/opencrypto/crypto.c
+++ b/freebsd/sys/opencrypto/crypto.c
@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/linker.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/malloc.h>
diff --git a/freebsd/sys/opencrypto/cryptosoft.c b/freebsd/sys/opencrypto/cryptosoft.c
index 233fe5b..11985f5 100644
--- a/freebsd/sys/opencrypto/cryptosoft.c
+++ b/freebsd/sys/opencrypto/cryptosoft.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <sys/random.h>
#include <sys/kernel.h>
#include <sys/uio.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/endian.h>
#include <sys/limits.h>
diff --git a/freebsd/sys/sys/_lock.h b/freebsd/sys/sys/_lock.h
index 2ab3d99..e92430c 100644
--- a/freebsd/sys/sys/_lock.h
+++ b/freebsd/sys/sys/_lock.h
@@ -34,11 +34,11 @@
struct lock_object {
#ifndef __rtems__
const char *lo_name; /* Individual lock name. */
-#endif /* __rtems__ */
u_int lo_flags;
-#ifndef __rtems__
u_int lo_data; /* General class specific data. */
struct witness *lo_witness; /* Data for witness. */
+#else /* __rtems__ */
+ unsigned int lo_flags;
#endif /* __rtems__ */
};
diff --git a/freebsd/sys/sys/buf.h b/freebsd/sys/sys/buf.h
index ea6019c..830fb05 100644
--- a/freebsd/sys/sys/buf.h
+++ b/freebsd/sys/sys/buf.h
@@ -40,7 +40,7 @@
#include <sys/bufobj.h>
#include <sys/queue.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/lockmgr.h>
struct bio;
diff --git a/freebsd/sys/sys/buf_ring.h b/freebsd/sys/sys/buf_ring.h
index 8653456..3655775 100644
--- a/freebsd/sys/sys/buf_ring.h
+++ b/freebsd/sys/sys/buf_ring.h
@@ -37,7 +37,7 @@
#endif
#ifdef DEBUG_BUFRING
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#endif
diff --git a/freebsd/sys/sys/eventhandler.h b/freebsd/sys/sys/eventhandler.h
index d03cd05..b071c63 100644
--- a/freebsd/sys/sys/eventhandler.h
+++ b/freebsd/sys/sys/eventhandler.h
@@ -29,7 +29,7 @@
#ifndef _SYS_EVENTHANDLER_H_
#define _SYS_EVENTHANDLER_H_
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/ktr.h>
#include <sys/mutex.h>
#include <sys/queue.h>
diff --git a/freebsd/sys/sys/fail.h b/freebsd/sys/sys/fail.h
index 34aa593..34695bc 100644
--- a/freebsd/sys/sys/fail.h
+++ b/freebsd/sys/sys/fail.h
@@ -39,7 +39,7 @@
#include <sys/sysctl.h>
#include <sys/condvar.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/systm.h>
diff --git a/freebsd/sys/sys/filedesc.h b/freebsd/sys/sys/filedesc.h
index 6b4dd1e..579e521 100644
--- a/freebsd/sys/sys/filedesc.h
+++ b/freebsd/sys/sys/filedesc.h
@@ -36,7 +36,7 @@
#include <sys/caprights.h>
#include <sys/queue.h>
#include <sys/event.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/priority.h>
#include <sys/seq.h>
#include <sys/sx.h>
diff --git a/freebsd/sys/sys/hhook.h b/freebsd/sys/sys/hhook.h
index 7de47d4..1d60dd3 100644
--- a/freebsd/sys/sys/hhook.h
+++ b/freebsd/sys/sys/hhook.h
@@ -50,7 +50,7 @@
#define _SYS_HHOOK_H_
/* XXXLAS: Is there a way around this? */
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rmlock.h>
/* hhook_head flags. */
diff --git a/freebsd/sys/sys/jail.h b/freebsd/sys/sys/jail.h
index 5fcbaf3..c67c8f5 100644
--- a/freebsd/sys/sys/jail.h
+++ b/freebsd/sys/sys/jail.h
@@ -118,7 +118,7 @@ int jail_remove(int);
#include <sys/queue.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/_task.h>
diff --git a/freebsd/sys/sys/lock_profile.h b/freebsd/sys/sys/lock_profile.h
index 579113a..bf73ca1 100644
--- a/freebsd/sys/sys/lock_profile.h
+++ b/freebsd/sys/sys/lock_profile.h
@@ -37,7 +37,7 @@ LIST_HEAD(lpohead, lock_profile_object);
#ifdef _KERNEL
#ifdef LOCK_PROFILING
#include <machine/cpufunc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#ifndef USE_CPU_NANOSECONDS
u_int64_t nanoseconds(void);
diff --git a/freebsd/sys/sys/mbuf.h b/freebsd/sys/sys/mbuf.h
index 4631a53..bd62c1c 100644
--- a/freebsd/sys/sys/mbuf.h
+++ b/freebsd/sys/sys/mbuf.h
@@ -40,7 +40,7 @@
#include <sys/systm.h>
#include <vm/uma.h>
#ifdef WITNESS
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#endif
#endif
diff --git a/freebsd/sys/sys/mount.h b/freebsd/sys/sys/mount.h
index e132159..9800d97 100644
--- a/freebsd/sys/sys/mount.h
+++ b/freebsd/sys/sys/mount.h
@@ -36,7 +36,7 @@
#include <sys/ucred.h>
#include <sys/queue.h>
#ifdef _KERNEL
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/lockmgr.h>
#include <sys/_mutex.h>
#include <sys/_sx.h>
diff --git a/freebsd/sys/sys/seq.h b/freebsd/sys/sys/seq.h
index 94be8a4..405e346 100644
--- a/freebsd/sys/sys/seq.h
+++ b/freebsd/sys/sys/seq.h
@@ -64,7 +64,7 @@ typedef uint32_t seq_t;
*/
/* A hack to get MPASS macro */
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <machine/cpu.h>
diff --git a/freebsd/sys/sys/tty.h b/freebsd/sys/sys/tty.h
index d6d6ee6..09e0419 100644
--- a/freebsd/sys/sys/tty.h
+++ b/freebsd/sys/sys/tty.h
@@ -34,7 +34,7 @@
#include <sys/param.h>
#include <sys/queue.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/selinfo.h>
diff --git a/freebsd/sys/sys/vnode.h b/freebsd/sys/sys/vnode.h
index 0d8c652..535016e 100644
--- a/freebsd/sys/sys/vnode.h
+++ b/freebsd/sys/sys/vnode.h
@@ -35,7 +35,7 @@
#include <sys/bufobj.h>
#include <sys/queue.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/lockmgr.h>
#include <sys/mutex.h>
#include <sys/rangelock.h>
diff --git a/freebsd/sys/vm/uma_core.c b/freebsd/sys/vm/uma_core.c
index 45e8462..f8c8476 100644
--- a/freebsd/sys/vm/uma_core.c
+++ b/freebsd/sys/vm/uma_core.c
@@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
#include <sys/queue.h>
#include <sys/malloc.h>
#include <sys/ktr.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/sysctl.h>
#include <sys/mutex.h>
#include <sys/proc.h>
diff --git a/freebsd/sys/vm/uma_dbg.c b/freebsd/sys/vm/uma_dbg.c
index ee9e743..b7e9c26 100644
--- a/freebsd/sys/vm/uma_dbg.c
+++ b/freebsd/sys/vm/uma_dbg.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/types.h>
#include <sys/queue.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/malloc.h>
diff --git a/rtemsbsd/include/machine/_kernel_lock.h b/rtemsbsd/include/machine/_kernel_lock.h
index e69de29..772e5dd 100644
--- a/rtemsbsd/include/machine/_kernel_lock.h
+++ b/rtemsbsd/include/machine/_kernel_lock.h
@@ -0,0 +1,319 @@
+/*-
+ * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Berkeley Software Design Inc's name may not be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL BERKELEY SOFTWARE DESIGN INC BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
+ * $FreeBSD$
+ */
+
+#ifndef _MACHINE__KERNEL_LOCK_H_
+#define _MACHINE__KERNEL_LOCK_H_
+
+#include <sys/queue.h>
+#include <sys/_lock.h>
+
+struct lock_list_entry;
+struct thread;
+
+/*
+ * Lock classes. Each lock has a class which describes characteristics
+ * common to all types of locks of a given class.
+ *
+ * Spin locks in general must always protect against preemption, as it is
+ * an error to perform any type of context switch while holding a spin lock.
+ * Also, for an individual lock to be recursable, its class must allow
+ * recursion and the lock itself must explicitly allow recursion.
+ *
+ * The 'lc_ddb_show' function pointer is used to dump class-specific
+ * data for the 'show lock' DDB command. The 'lc_lock' and
+ * 'lc_unlock' function pointers are used in sleep(9) and cv_wait(9)
+ * to lock and unlock locks while blocking on a sleep queue. The
+ * return value of 'lc_unlock' will be passed to 'lc_lock' on resume
+ * to allow communication of state between the two routines.
+ */
+
+struct lock_class {
+ const char *lc_name;
+ unsigned int lc_flags;
+ void (*lc_assert)(struct lock_object *lock, int what);
+ void (*lc_ddb_show)(struct lock_object *lock);
+ void (*lc_lock)(struct lock_object *lock, int how);
+ int (*lc_owner)(struct lock_object *lock, struct thread **owner);
+ int (*lc_unlock)(struct lock_object *lock);
+};
+
+#define LC_SLEEPLOCK 0x00000001 /* Sleep lock. */
+#define LC_SPINLOCK 0x00000002 /* Spin lock. */
+#define LC_SLEEPABLE 0x00000004 /* Sleeping allowed with this lock. */
+#define LC_RECURSABLE 0x00000008 /* Locks of this type may recurse. */
+#define LC_UPGRADABLE 0x00000010 /* Upgrades and downgrades permitted. */
+
+#define LO_CLASSFLAGS 0x0000ffff /* Class specific flags. */
+#define LO_INITIALIZED 0x00010000 /* Lock has been initialized. */
+#define LO_WITNESS 0x00020000 /* Should witness monitor this lock. */
+#define LO_QUIET 0x00040000 /* Don't log locking operations. */
+#define LO_RECURSABLE 0x00080000 /* Lock may recurse. */
+#define LO_SLEEPABLE 0x00100000 /* Lock may be held while sleeping. */
+#define LO_UPGRADABLE 0x00200000 /* Lock may be upgraded/downgraded. */
+#define LO_DUPOK 0x00400000 /* Don't check for duplicate acquires */
+#define LO_CLASSMASK 0x0f000000 /* Class index bitmask. */
+#define LO_NOPROFILE 0x10000000 /* Don't profile this lock */
+
+/*
+ * Lock classes are statically assigned an index into the gobal lock_classes
+ * array. Debugging code looks up the lock class for a given lock object
+ * by indexing the array.
+ */
+#define LO_CLASSSHIFT 24
+#define LO_CLASSINDEX(lock) ((((lock)->lo_flags) & LO_CLASSMASK) >> LO_CLASSSHIFT)
+#define LOCK_CLASS(lock) (lock_classes[LO_CLASSINDEX((lock))])
+#define LOCK_CLASS_MAX (LO_CLASSMASK >> LO_CLASSSHIFT)
+
+/*
+ * Option flags passed to lock operations that witness also needs to know
+ * about or that are generic across all locks.
+ */
+#define LOP_NEWORDER 0x00000001 /* Define a new lock order. */
+#define LOP_QUIET 0x00000002 /* Don't log locking operations. */
+#define LOP_TRYLOCK 0x00000004 /* Don't check lock order. */
+#define LOP_EXCLUSIVE 0x00000008 /* Exclusive lock. */
+#define LOP_DUPOK 0x00000010 /* Don't check for duplicate acquires */
+
+/* Flags passed to witness_assert. */
+#define LA_MASKASSERT 0x000000ff /* Mask for witness defined asserts. */
+#define LA_UNLOCKED 0x00000000 /* Lock is unlocked. */
+#define LA_LOCKED 0x00000001 /* Lock is at least share locked. */
+#define LA_SLOCKED 0x00000002 /* Lock is exactly share locked. */
+#define LA_XLOCKED 0x00000004 /* Lock is exclusively locked. */
+#define LA_RECURSED 0x00000008 /* Lock is recursed. */
+#define LA_NOTRECURSED 0x00000010 /* Lock is not recursed. */
+
+#ifdef _KERNEL
+/*
+ * If any of WITNESS, INVARIANTS, or KTR_LOCK KTR tracing has been enabled,
+ * then turn on LOCK_DEBUG. When this option is on, extra debugging
+ * facilities such as tracking the file and line number of lock operations
+ * are enabled. Also, mutex locking operations are not inlined to avoid
+ * bloat from all the extra debugging code. We also have to turn on all the
+ * calling conventions for this debugging code in modules so that modules can
+ * work with both debug and non-debug kernels.
+ */
+#if defined(KLD_MODULE) || defined(WITNESS) || defined(INVARIANTS) || defined(INVARIANT_SUPPORT) || defined(KTR) || defined(LOCK_PROFILING)
+#define LOCK_DEBUG 1
+#else
+#define LOCK_DEBUG 0
+#endif
+
+/*
+ * In the LOCK_DEBUG case, use the filename and line numbers for debugging
+ * operations. Otherwise, use default values to avoid the unneeded bloat.
+ */
+#if LOCK_DEBUG > 0
+#define LOCK_FILE __FILE__
+#define LOCK_LINE __LINE__
+#else
+#define LOCK_FILE NULL
+#define LOCK_LINE 0
+#endif
+
+/*
+ * Macros for KTR_LOCK tracing.
+ *
+ * opname - name of this operation (LOCK/UNLOCK/SLOCK, etc.)
+ * lo - struct lock_object * for this lock
+ * flags - flags passed to the lock operation
+ * recurse - this locks recursion level (or 0 if class is not recursable)
+ * result - result of a try lock operation
+ * file - file name
+ * line - line number
+ */
+#define LOCK_LOG_TEST(lo, flags) \
+ (((flags) & LOP_QUIET) == 0 && ((lo)->lo_flags & LO_QUIET) == 0)
+
+#define LOCK_LOG_LOCK(opname, lo, flags, recurse, file, line) do { \
+ if (LOCK_LOG_TEST((lo), (flags))) \
+ CTR6(KTR_LOCK, opname " (%s) %s %p r = %d at %s:%d", \
+ LOCK_CLASS(lo)->lc_name, (lo)->lo_name, \
+ (lo), (u_int)(recurse), (file), (line)); \
+} while (0)
+
+#define LOCK_LOG_TRY(opname, lo, flags, result, file, line) do { \
+ if (LOCK_LOG_TEST((lo), (flags))) \
+ CTR6(KTR_LOCK, "TRY_" opname " (%s) %s %p result=%d at %s:%d",\
+ LOCK_CLASS(lo)->lc_name, (lo)->lo_name, \
+ (lo), (u_int)(result), (file), (line)); \
+} while (0)
+
+#define LOCK_LOG_INIT(lo, flags) do { \
+ if (LOCK_LOG_TEST((lo), (flags))) \
+ CTR4(KTR_LOCK, "%s: %p (%s) %s", __func__, (lo), \
+ LOCK_CLASS(lo)->lc_name, (lo)->lo_name); \
+} while (0)
+
+#define LOCK_LOG_DESTROY(lo, flags) LOCK_LOG_INIT(lo, flags)
+
+#define lock_initialized(lo) ((lo)->lo_flags & LO_INITIALIZED)
+
+/*
+ * Helpful macros for quickly coming up with assertions with informative
+ * panic messages.
+ */
+#define MPASS(ex) MPASS4(ex, #ex, __FILE__, __LINE__)
+#define MPASS2(ex, what) MPASS4(ex, what, __FILE__, __LINE__)
+#define MPASS3(ex, file, line) MPASS4(ex, #ex, file, line)
+#define MPASS4(ex, what, file, line) \
+ KASSERT((ex), ("Assertion %s failed at %s:%d", what, file, line))
+
+extern struct lock_class lock_class_mtx_sleep;
+extern struct lock_class lock_class_mtx_spin;
+extern struct lock_class lock_class_sx;
+extern struct lock_class lock_class_rw;
+extern struct lock_class lock_class_rm;
+extern struct lock_class lock_class_lockmgr;
+
+extern struct lock_class *lock_classes[];
+
+void lock_init(struct lock_object *, struct lock_class *,
+ const char *, const char *, int);
+void lock_destroy(struct lock_object *);
+void spinlock_enter(void);
+void spinlock_exit(void);
+void witness_init(struct lock_object *, const char *);
+void witness_destroy(struct lock_object *);
+int witness_defineorder(struct lock_object *, struct lock_object *);
+void witness_checkorder(struct lock_object *, int, const char *, int,
+ struct lock_object *);
+void witness_lock(struct lock_object *, int, const char *, int);
+void witness_upgrade(struct lock_object *, int, const char *, int);
+void witness_downgrade(struct lock_object *, int, const char *, int);
+void witness_unlock(struct lock_object *, int, const char *, int);
+void witness_save(struct lock_object *, const char **, int *);
+void witness_restore(struct lock_object *, const char *, int);
+int witness_list_locks(struct lock_list_entry **,
+ int (*)(const char *, ...));
+int witness_warn(int, struct lock_object *, const char *, ...);
+void witness_assert(struct lock_object *, int, const char *, int);
+void witness_display_spinlock(struct lock_object *, struct thread *,
+ int (*)(const char *, ...));
+int witness_line(struct lock_object *);
+void witness_norelease(struct lock_object *);
+void witness_releaseok(struct lock_object *);
+const char *witness_file(struct lock_object *);
+void witness_thread_exit(struct thread *);
+
+#ifdef WITNESS
+
+/* Flags for witness_warn(). */
+#define WARN_GIANTOK 0x01 /* Giant is exempt from this check. */
+#define WARN_PANIC 0x02 /* Panic if check fails. */
+#define WARN_SLEEPOK 0x04 /* Sleepable locks are exempt from check. */
+
+#define WITNESS_INIT(lock, type) \
+ witness_init((lock), (type))
+
+#define WITNESS_DESTROY(lock) \
+ witness_destroy(lock)
+
+#define WITNESS_CHECKORDER(lock, flags, file, line, interlock) \
+ witness_checkorder((lock), (flags), (file), (line), (interlock))
+
+#define WITNESS_DEFINEORDER(lock1, lock2) \
+ witness_defineorder((struct lock_object *)(lock1), \
+ (struct lock_object *)(lock2))
+
+#define WITNESS_LOCK(lock, flags, file, line) \
+ witness_lock((lock), (flags), (file), (line))
+
+#define WITNESS_UPGRADE(lock, flags, file, line) \
+ witness_upgrade((lock), (flags), (file), (line))
+
+#define WITNESS_DOWNGRADE(lock, flags, file, line) \
+ witness_downgrade((lock), (flags), (file), (line))
+
+#define WITNESS_UNLOCK(lock, flags, file, line) \
+ witness_unlock((lock), (flags), (file), (line))
+
+#define WITNESS_CHECK(flags, lock, fmt, ...) \
+ witness_warn((flags), (lock), (fmt), ## __VA_ARGS__)
+
+#define WITNESS_WARN(flags, lock, fmt, ...) \
+ witness_warn((flags), (lock), (fmt), ## __VA_ARGS__)
+
+#define WITNESS_SAVE_DECL(n) \
+ const char * __CONCAT(n, __wf); \
+ int __CONCAT(n, __wl)
+
+#define WITNESS_SAVE(lock, n) \
+ witness_save((lock), &__CONCAT(n, __wf), &__CONCAT(n, __wl))
+
+#define WITNESS_RESTORE(lock, n) \
+ witness_restore((lock), __CONCAT(n, __wf), __CONCAT(n, __wl))
+
+#define WITNESS_NORELEASE(lock) \
+ witness_norelease(&(lock)->lock_object)
+
+#define WITNESS_RELEASEOK(lock) \
+ witness_releaseok(&(lock)->lock_object)
+
+#define WITNESS_FILE(lock) \
+ witness_file(lock)
+
+#define WITNESS_LINE(lock) \
+ witness_line(lock)
+
+#else /* WITNESS */
+#define WITNESS_INIT(lock, type) (void)0
+#define WITNESS_DESTROY(lock) (void)0
+#define WITNESS_DEFINEORDER(lock1, lock2) 0
+#define WITNESS_CHECKORDER(lock, flags, file, line, interlock) (void)0
+#define WITNESS_LOCK(lock, flags, file, line) (void)0
+#define WITNESS_UPGRADE(lock, flags, file, line) (void)0
+#define WITNESS_DOWNGRADE(lock, flags, file, line) (void)0
+#define WITNESS_UNLOCK(lock, flags, file, line) (void)0
+#define WITNESS_CHECK(flags, lock, fmt, ...) 0
+#define WITNESS_WARN(flags, lock, fmt, ...) (void)0
+#define WITNESS_SAVE_DECL(n) (void)0
+#define WITNESS_SAVE(lock, n) (void)0
+#define WITNESS_RESTORE(lock, n) (void)0
+#define WITNESS_NORELEASE(lock) (void)0
+#define WITNESS_RELEASEOK(lock) (void)0
+#define WITNESS_FILE(lock) ("?")
+#define WITNESS_LINE(lock) (0)
+#endif /* WITNESS */
+
+/*
+ * Helper macros to allow developers to add explicit lock order checks
+ * wherever they please without having to actually grab a lock to do so.
+ */
+#define witness_check(l) \
+ WITNESS_CHECKORDER(&(l)->lock_object, LOP_EXCLUSIVE, LOCK_FILE, \
+ LOCK_LINE, NULL)
+
+#define witness_check_shared(l) \
+ WITNESS_CHECKORDER(&(l)->lock_object, 0, LOCK_FILE, LOCK_LINE, NULL)
+
+#endif /* _KERNEL */
+#endif /* _MACHINE__KERNEL_LOCK_H_ */
diff --git a/rtemsbsd/include/machine/rtems-bsd-bus-dma.h b/rtemsbsd/include/machine/rtems-bsd-bus-dma.h
index 0ac3751..ac97053 100644
--- a/rtemsbsd/include/machine/rtems-bsd-bus-dma.h
+++ b/rtemsbsd/include/machine/rtems-bsd-bus-dma.h
@@ -49,7 +49,7 @@
#include <sys/param.h>
#include <sys/types.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/systm.h>
#include <machine/bus.h>
diff --git a/rtemsbsd/include/machine/rtems-bsd-muteximpl.h b/rtemsbsd/include/machine/rtems-bsd-muteximpl.h
index 71a7cbd..9896204 100644
--- a/rtemsbsd/include/machine/rtems-bsd-muteximpl.h
+++ b/rtemsbsd/include/machine/rtems-bsd-muteximpl.h
@@ -45,7 +45,7 @@
#include <machine/rtems-bsd-support.h>
#include <sys/types.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <rtems/score/threadimpl.h>
#include <rtems/score/threadqimpl.h>
diff --git a/rtemsbsd/include/rtems/bsd/sys/lock.h b/rtemsbsd/include/rtems/bsd/sys/lock.h
deleted file mode 100644
index 0456d0d..0000000
--- a/rtemsbsd/include/rtems/bsd/sys/lock.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*-
- * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Berkeley Software Design Inc's name may not be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL BERKELEY SOFTWARE DESIGN INC BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
- */
-
-#ifndef _RTEMS_BSD_SYS_LOCK_H_
-#define _RTEMS_BSD_SYS_LOCK_H_
-
-#include <sys/queue.h>
-#include <sys/_lock.h>
-
-struct lock_list_entry;
-struct thread;
-
-/*
- * Lock classes. Each lock has a class which describes characteristics
- * common to all types of locks of a given class.
- *
- * Spin locks in general must always protect against preemption, as it is
- * an error to perform any type of context switch while holding a spin lock.
- * Also, for an individual lock to be recursable, its class must allow
- * recursion and the lock itself must explicitly allow recursion.
- *
- * The 'lc_ddb_show' function pointer is used to dump class-specific
- * data for the 'show lock' DDB command. The 'lc_lock' and
- * 'lc_unlock' function pointers are used in sleep(9) and cv_wait(9)
- * to lock and unlock locks while blocking on a sleep queue. The
- * return value of 'lc_unlock' will be passed to 'lc_lock' on resume
- * to allow communication of state between the two routines.
- */
-
-struct lock_class {
- const char *lc_name;
- u_int lc_flags;
- void (*lc_assert)(struct lock_object *lock, int what);
- void (*lc_ddb_show)(struct lock_object *lock);
- void (*lc_lock)(struct lock_object *lock, int how);
- int (*lc_owner)(struct lock_object *lock, struct thread **owner);
- int (*lc_unlock)(struct lock_object *lock);
-};
-
-#define LC_SLEEPLOCK 0x00000001 /* Sleep lock. */
-#define LC_SPINLOCK 0x00000002 /* Spin lock. */
-#define LC_SLEEPABLE 0x00000004 /* Sleeping allowed with this lock. */
-#define LC_RECURSABLE 0x00000008 /* Locks of this type may recurse. */
-#define LC_UPGRADABLE 0x00000010 /* Upgrades and downgrades permitted. */
-
-#define LO_CLASSFLAGS 0x0000ffff /* Class specific flags. */
-#define LO_INITIALIZED 0x00010000 /* Lock has been initialized. */
-#define LO_WITNESS 0x00020000 /* Should witness monitor this lock. */
-#define LO_QUIET 0x00040000 /* Don't log locking operations. */
-#define LO_RECURSABLE 0x00080000 /* Lock may recurse. */
-#define LO_SLEEPABLE 0x00100000 /* Lock may be held while sleeping. */
-#define LO_UPGRADABLE 0x00200000 /* Lock may be upgraded/downgraded. */
-#define LO_DUPOK 0x00400000 /* Don't check for duplicate acquires */
-#define LO_CLASSMASK 0x0f000000 /* Class index bitmask. */
-#define LO_NOPROFILE 0x10000000 /* Don't profile this lock */
-
-/*
- * Lock classes are statically assigned an index into the gobal lock_classes
- * array. Debugging code looks up the lock class for a given lock object
- * by indexing the array.
- */
-#define LO_CLASSSHIFT 24
-#define LO_CLASSINDEX(lock) ((((lock)->lo_flags) & LO_CLASSMASK) >> LO_CLASSSHIFT)
-#define LOCK_CLASS(lock) (lock_classes[LO_CLASSINDEX((lock))])
-#define LOCK_CLASS_MAX (LO_CLASSMASK >> LO_CLASSSHIFT)
-
-/*
- * Option flags passed to lock operations that witness also needs to know
- * about or that are generic across all locks.
- */
-#define LOP_NEWORDER 0x00000001 /* Define a new lock order. */
-#define LOP_QUIET 0x00000002 /* Don't log locking operations. */
-#define LOP_TRYLOCK 0x00000004 /* Don't check lock order. */
-#define LOP_EXCLUSIVE 0x00000008 /* Exclusive lock. */
-#define LOP_DUPOK 0x00000010 /* Don't check for duplicate acquires */
-
-/* Flags passed to witness_assert. */
-#define LA_MASKASSERT 0x000000ff /* Mask for witness defined asserts. */
-#define LA_UNLOCKED 0x00000000 /* Lock is unlocked. */
-#define LA_LOCKED 0x00000001 /* Lock is at least share locked. */
-#define LA_SLOCKED 0x00000002 /* Lock is exactly share locked. */
-#define LA_XLOCKED 0x00000004 /* Lock is exclusively locked. */
-#define LA_RECURSED 0x00000008 /* Lock is recursed. */
-#define LA_NOTRECURSED 0x00000010 /* Lock is not recursed. */
-
-#ifdef _KERNEL
-/*
- * If any of WITNESS, INVARIANTS, or KTR_LOCK KTR tracing has been enabled,
- * then turn on LOCK_DEBUG. When this option is on, extra debugging
- * facilities such as tracking the file and line number of lock operations
- * are enabled. Also, mutex locking operations are not inlined to avoid
- * bloat from all the extra debugging code. We also have to turn on all the
- * calling conventions for this debugging code in modules so that modules can
- * work with both debug and non-debug kernels.
- */
-#if defined(KLD_MODULE) || defined(WITNESS) || defined(INVARIANTS) || defined(INVARIANT_SUPPORT) || defined(KTR) || defined(LOCK_PROFILING)
-#define LOCK_DEBUG 1
-#else
-#define LOCK_DEBUG 0
-#endif
-
-/*
- * In the LOCK_DEBUG case, use the filename and line numbers for debugging
- * operations. Otherwise, use default values to avoid the unneeded bloat.
- */
-#if LOCK_DEBUG > 0
-#define LOCK_FILE __FILE__
-#define LOCK_LINE __LINE__
-#else
-#define LOCK_FILE NULL
-#define LOCK_LINE 0
-#endif
-
-/*
- * Macros for KTR_LOCK tracing.
- *
- * opname - name of this operation (LOCK/UNLOCK/SLOCK, etc.)
- * lo - struct lock_object * for this lock
- * flags - flags passed to the lock operation
- * recurse - this locks recursion level (or 0 if class is not recursable)
- * result - result of a try lock operation
- * file - file name
- * line - line number
- */
-#define LOCK_LOG_TEST(lo, flags) \
- (((flags) & LOP_QUIET) == 0 && ((lo)->lo_flags & LO_QUIET) == 0)
-
-#define LOCK_LOG_LOCK(opname, lo, flags, recurse, file, line) do { \
- if (LOCK_LOG_TEST((lo), (flags))) \
- CTR6(KTR_LOCK, opname " (%s) %s %p r = %d at %s:%d", \
- LOCK_CLASS(lo)->lc_name, (lo)->lo_name, \
- (lo), (u_int)(recurse), (file), (line)); \
-} while (0)
-
-#define LOCK_LOG_TRY(opname, lo, flags, result, file, line) do { \
- if (LOCK_LOG_TEST((lo), (flags))) \
- CTR6(KTR_LOCK, "TRY_" opname " (%s) %s %p result=%d at %s:%d",\
- LOCK_CLASS(lo)->lc_name, (lo)->lo_name, \
- (lo), (u_int)(result), (file), (line)); \
-} while (0)
-
-#define LOCK_LOG_INIT(lo, flags) do { \
- if (LOCK_LOG_TEST((lo), (flags))) \
- CTR4(KTR_LOCK, "%s: %p (%s) %s", __func__, (lo), \
- LOCK_CLASS(lo)->lc_name, (lo)->lo_name); \
-} while (0)
-
-#define LOCK_LOG_DESTROY(lo, flags) LOCK_LOG_INIT(lo, flags)
-
-#define lock_initialized(lo) ((lo)->lo_flags & LO_INITIALIZED)
-
-/*
- * Helpful macros for quickly coming up with assertions with informative
- * panic messages.
- */
-#define MPASS(ex) MPASS4(ex, #ex, __FILE__, __LINE__)
-#define MPASS2(ex, what) MPASS4(ex, what, __FILE__, __LINE__)
-#define MPASS3(ex, file, line) MPASS4(ex, #ex, file, line)
-#define MPASS4(ex, what, file, line) \
- KASSERT((ex), ("Assertion %s failed at %s:%d", what, file, line))
-
-extern struct lock_class lock_class_mtx_sleep;
-extern struct lock_class lock_class_mtx_spin;
-extern struct lock_class lock_class_sx;
-extern struct lock_class lock_class_rw;
-extern struct lock_class lock_class_rm;
-extern struct lock_class lock_class_lockmgr;
-
-extern struct lock_class *lock_classes[];
-
-void lock_init(struct lock_object *, struct lock_class *,
- const char *, const char *, int);
-void lock_destroy(struct lock_object *);
-void spinlock_enter(void);
-void spinlock_exit(void);
-void witness_init(struct lock_object *, const char *);
-void witness_destroy(struct lock_object *);
-int witness_defineorder(struct lock_object *, struct lock_object *);
-void witness_checkorder(struct lock_object *, int, const char *, int,
- struct lock_object *);
-void witness_lock(struct lock_object *, int, const char *, int);
-void witness_upgrade(struct lock_object *, int, const char *, int);
-void witness_downgrade(struct lock_object *, int, const char *, int);
-void witness_unlock(struct lock_object *, int, const char *, int);
-void witness_save(struct lock_object *, const char **, int *);
-void witness_restore(struct lock_object *, const char *, int);
-int witness_list_locks(struct lock_list_entry **,
- int (*)(const char *, ...));
-int witness_warn(int, struct lock_object *, const char *, ...);
-void witness_assert(struct lock_object *, int, const char *, int);
-void witness_display_spinlock(struct lock_object *, struct thread *,
- int (*)(const char *, ...));
-int witness_line(struct lock_object *);
-void witness_norelease(struct lock_object *);
-void witness_releaseok(struct lock_object *);
-const char *witness_file(struct lock_object *);
-void witness_thread_exit(struct thread *);
-
-#ifdef WITNESS
-
-/* Flags for witness_warn(). */
-#define WARN_GIANTOK 0x01 /* Giant is exempt from this check. */
-#define WARN_PANIC 0x02 /* Panic if check fails. */
-#define WARN_SLEEPOK 0x04 /* Sleepable locks are exempt from check. */
-
-#define WITNESS_INIT(lock, type) \
- witness_init((lock), (type))
-
-#define WITNESS_DESTROY(lock) \
- witness_destroy(lock)
-
-#define WITNESS_CHECKORDER(lock, flags, file, line, interlock) \
- witness_checkorder((lock), (flags), (file), (line), (interlock))
-
-#define WITNESS_DEFINEORDER(lock1, lock2) \
- witness_defineorder((struct lock_object *)(lock1), \
- (struct lock_object *)(lock2))
-
-#define WITNESS_LOCK(lock, flags, file, line) \
- witness_lock((lock), (flags), (file), (line))
-
-#define WITNESS_UPGRADE(lock, flags, file, line) \
- witness_upgrade((lock), (flags), (file), (line))
-
-#define WITNESS_DOWNGRADE(lock, flags, file, line) \
- witness_downgrade((lock), (flags), (file), (line))
-
-#define WITNESS_UNLOCK(lock, flags, file, line) \
- witness_unlock((lock), (flags), (file), (line))
-
-#define WITNESS_CHECK(flags, lock, fmt, ...) \
- witness_warn((flags), (lock), (fmt), ## __VA_ARGS__)
-
-#define WITNESS_WARN(flags, lock, fmt, ...) \
- witness_warn((flags), (lock), (fmt), ## __VA_ARGS__)
-
-#define WITNESS_SAVE_DECL(n) \
- const char * __CONCAT(n, __wf); \
- int __CONCAT(n, __wl)
-
-#define WITNESS_SAVE(lock, n) \
- witness_save((lock), &__CONCAT(n, __wf), &__CONCAT(n, __wl))
-
-#define WITNESS_RESTORE(lock, n) \
- witness_restore((lock), __CONCAT(n, __wf), __CONCAT(n, __wl))
-
-#define WITNESS_NORELEASE(lock) \
- witness_norelease(&(lock)->lock_object)
-
-#define WITNESS_RELEASEOK(lock) \
- witness_releaseok(&(lock)->lock_object)
-
-#define WITNESS_FILE(lock) \
- witness_file(lock)
-
-#define WITNESS_LINE(lock) \
- witness_line(lock)
-
-#else /* WITNESS */
-#define WITNESS_INIT(lock, type) (void)0
-#define WITNESS_DESTROY(lock) (void)0
-#define WITNESS_DEFINEORDER(lock1, lock2) 0
-#define WITNESS_CHECKORDER(lock, flags, file, line, interlock) (void)0
-#define WITNESS_LOCK(lock, flags, file, line) (void)0
-#define WITNESS_UPGRADE(lock, flags, file, line) (void)0
-#define WITNESS_DOWNGRADE(lock, flags, file, line) (void)0
-#define WITNESS_UNLOCK(lock, flags, file, line) (void)0
-#define WITNESS_CHECK(flags, lock, fmt, ...) 0
-#define WITNESS_WARN(flags, lock, fmt, ...) (void)0
-#define WITNESS_SAVE_DECL(n) (void)0
-#define WITNESS_SAVE(lock, n) (void)0
-#define WITNESS_RESTORE(lock, n) (void)0
-#define WITNESS_NORELEASE(lock) (void)0
-#define WITNESS_RELEASEOK(lock) (void)0
-#define WITNESS_FILE(lock) ("?")
-#define WITNESS_LINE(lock) (0)
-#endif /* WITNESS */
-
-/*
- * Helper macros to allow developers to add explicit lock order checks
- * wherever they please without having to actually grab a lock to do so.
- */
-#define witness_check(l) \
- WITNESS_CHECKORDER(&(l)->lock_object, LOP_EXCLUSIVE, LOCK_FILE, \
- LOCK_LINE, NULL)
-
-#define witness_check_shared(l) \
- WITNESS_CHECKORDER(&(l)->lock_object, 0, LOCK_FILE, LOCK_LINE, NULL)
-
-#endif /* _KERNEL */
-#endif /* _RTEMS_BSD_SYS_LOCK_H_ */
diff --git a/rtemsbsd/rtems/rtems-bsd-generic.c b/rtemsbsd/rtems/rtems-bsd-generic.c
index 06c6302..1fd9cc6 100644
--- a/rtemsbsd/rtems/rtems-bsd-generic.c
+++ b/rtemsbsd/rtems/rtems-bsd-generic.c
@@ -49,7 +49,7 @@
#include <sys/protosw.h>
#include <sys/select.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/malloc.h>
diff --git a/rtemsbsd/rtems/rtems-kernel-cam.c b/rtemsbsd/rtems/rtems-kernel-cam.c
index a63e1bf..b2abff3 100644
--- a/rtemsbsd/rtems/rtems-kernel-cam.c
+++ b/rtemsbsd/rtems/rtems-kernel-cam.c
@@ -45,7 +45,7 @@
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
diff --git a/rtemsbsd/rtems/rtems-kernel-init.c b/rtemsbsd/rtems/rtems-kernel-init.c
index 45105c5..594e1ba 100644
--- a/rtemsbsd/rtems/rtems-kernel-init.c
+++ b/rtemsbsd/rtems/rtems-kernel-init.c
@@ -45,7 +45,7 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/stat.h>
diff --git a/rtemsbsd/rtems/rtems-kernel-jail.c b/rtemsbsd/rtems/rtems-kernel-jail.c
index 2a2d309..d6ac636 100644
--- a/rtemsbsd/rtems/rtems-kernel-jail.c
+++ b/rtemsbsd/rtems/rtems-kernel-jail.c
@@ -43,7 +43,7 @@
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/jail.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>*/
#include <sys/param.h>
@@ -59,7 +59,7 @@
#include <sys/taskqueue.h>
#include <sys/fcntl.h>
#include <sys/jail.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/sx.h>
#include <sys/sysent.h>
diff --git a/rtemsbsd/rtems/rtems-kernel-mutex.c b/rtemsbsd/rtems/rtems-kernel-mutex.c
index 9a3b058..f403c70 100644
--- a/rtemsbsd/rtems/rtems-kernel-mutex.c
+++ b/rtemsbsd/rtems/rtems-kernel-mutex.c
@@ -43,7 +43,7 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/conf.h>
diff --git a/rtemsbsd/rtems/rtems-kernel-page.c b/rtemsbsd/rtems/rtems-kernel-page.c
index 6f2531e..c2ed23f 100644
--- a/rtemsbsd/rtems/rtems-kernel-page.c
+++ b/rtemsbsd/rtems/rtems-kernel-page.c
@@ -42,7 +42,7 @@
#include <sys/param.h>
#include <sys/types.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/rtemsbsd/rtems/rtems-kernel-pci_cfgreg.c b/rtemsbsd/rtems/rtems-kernel-pci_cfgreg.c
index b5a5b8c..887672b 100644
--- a/rtemsbsd/rtems/rtems-kernel-pci_cfgreg.c
+++ b/rtemsbsd/rtems/rtems-kernel-pci_cfgreg.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/sysctl.h>
diff --git a/rtemsbsd/rtems/rtems-kernel-program.c b/rtemsbsd/rtems/rtems-kernel-program.c
index 743aff1..affbc1a 100644
--- a/rtemsbsd/rtems/rtems-kernel-program.c
+++ b/rtemsbsd/rtems/rtems-kernel-program.c
@@ -42,7 +42,7 @@
#include <sys/types.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#undef printf
diff --git a/rtemsbsd/rtems/rtems-kernel-rwlock.c b/rtemsbsd/rtems/rtems-kernel-rwlock.c
index ac7cc1b..1e46f57 100644
--- a/rtemsbsd/rtems/rtems-kernel-rwlock.c
+++ b/rtemsbsd/rtems/rtems-kernel-rwlock.c
@@ -51,7 +51,7 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#ifndef INVARIANTS
diff --git a/rtemsbsd/rtems/rtems-kernel-sx.c b/rtemsbsd/rtems/rtems-kernel-sx.c
index 2cc9d02..5f39a4d 100644
--- a/rtemsbsd/rtems/rtems-kernel-sx.c
+++ b/rtemsbsd/rtems/rtems-kernel-sx.c
@@ -44,7 +44,7 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/sx.h>
#ifndef INVARIANTS
diff --git a/rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c b/rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c
index 4cb6046..c37bd86 100644
--- a/rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c
+++ b/rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/rman.h>
#include <sys/bus.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
diff --git a/rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c b/rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c
index 411007f..97be3ad 100644
--- a/rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c
+++ b/rtemsbsd/sys/dev/usb/controller/dwc_otg_nexus.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/condvar.h>
#include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
diff --git a/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c b/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
index 7eb81d7..bde8007 100644
--- a/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
+++ b/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
@@ -62,7 +62,7 @@
#include <sys/bus.h>
#include <sys/linker_set.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/rtemsbsd/sys/dev/usb/controller/ohci_lpc.c b/rtemsbsd/sys/dev/usb/controller/ohci_lpc.c
index c42634f..ac806ec 100755
--- a/rtemsbsd/sys/dev/usb/controller/ohci_lpc.c
+++ b/rtemsbsd/sys/dev/usb/controller/ohci_lpc.c
@@ -145,7 +145,7 @@ static int lpc_otg_clk_ctrl(uint32_t otg_clk_ctrl)
#include <sys/bus.h>
#include <sys/linker_set.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c b/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c
index 5cd4c34..c7c09bb 100755
--- a/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c
+++ b/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/sysctl.h>
diff --git a/testsuite/condvar01/test_main.c b/testsuite/condvar01/test_main.c
index 9cd20cb..8b2d102 100644
--- a/testsuite/condvar01/test_main.c
+++ b/testsuite/condvar01/test_main.c
@@ -34,7 +34,7 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
diff --git a/testsuite/mutex01/test_main.c b/testsuite/mutex01/test_main.c
index 8d871c9..2402883 100644
--- a/testsuite/mutex01/test_main.c
+++ b/testsuite/mutex01/test_main.c
@@ -34,7 +34,7 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <assert.h>
diff --git a/testsuite/rwlock01/test_main.c b/testsuite/rwlock01/test_main.c
index 071f339..a0ae91b 100644
--- a/testsuite/rwlock01/test_main.c
+++ b/testsuite/rwlock01/test_main.c
@@ -34,7 +34,7 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/rwlock.h>
#include <assert.h>
diff --git a/testsuite/sleep01/test_main.c b/testsuite/sleep01/test_main.c
index 00fbb91..ffea742 100644
--- a/testsuite/sleep01/test_main.c
+++ b/testsuite/sleep01/test_main.c
@@ -33,7 +33,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <assert.h>
diff --git a/testsuite/smp01/test_main.c b/testsuite/smp01/test_main.c
index f8c0df2..a20d17c 100644
--- a/testsuite/smp01/test_main.c
+++ b/testsuite/smp01/test_main.c
@@ -34,7 +34,7 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
diff --git a/testsuite/timeout01/timeout_test.c b/testsuite/timeout01/timeout_test.c
index cecbfbe..0dccd2f 100644
--- a/testsuite/timeout01/timeout_test.c
+++ b/testsuite/timeout01/timeout_test.c
@@ -29,21 +29,16 @@
* SUCH DAMAGE.
*/
-#include <assert.h>
-
-#include <stdio.h>
-#include <unistd.h>
-
#include <machine/rtems-bsd-kernel-space.h>
-#include <sys/types.h>
-#include <sys/systm.h>
-
#include <sys/param.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/systm.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/rwlock.h>
+#include <assert.h>
+
#define TIMEOUT_MILLISECONDS (100)
// test after TEST_NOT_FIRED_MS, if handlar has not been executed
More information about the vc
mailing list