diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-06-08 13:15:12 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-06-08 13:20:09 +0200 |
| commit | 3c967ca2388b57d828f16e8b55ec6ccb34824a18 (patch) | |
| tree | 9a55353cc8e13219fa4f4e48c5a6dfd581d69d16 | |
| parent | Update due to Newlib 2017-06-07 changes (diff) | |
| download | rtems-libbsd-3c967ca2388b57d828f16e8b55ec6ccb34824a18.tar.bz2 | |
Use <sys/lock.h> provided by Newlib
361 files changed, 683 insertions, 689 deletions
@@ -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 9c847283..d9c1e381 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 7398af7a..57b9ff72 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 5f9450c2..1c3a8c3b 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 2b4a09b6..5901c472 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 d702f6f3..35ab0353 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 488b64d9..9848b461 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 94b1a9d2..507547a9 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 62203ae1..c7c23e58 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 3207cd87..6412544b 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 1c585e35..efebf02a 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 850a9afb..e4cfc2ac 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 d49316eb..c19fae7a 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 08296d7b..f76e9637 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 b364edf0..5066e250 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 9bf91f0a..7132c419 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 2504624f..0a2cb648 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 326e2a48..6adbee68 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 e5380154..9ce96a9e 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 8b90aacb..1ff5a35c 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 36658420..eceae5bb 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 58d28562..c2c3483b 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 10ba0de5..5be50c31 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 3beb07d1..5dd72605 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 57b38663..61c21954 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 4b7d049e..5d623a74 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 8abf1313..85ede40a 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 b3434cad..8ce54f0d 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 533bf239..150500d8 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 943be372..50e915ee 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 05149560..316baafe 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 9922592f..592f391a 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 f878469f..8b8ad7a1 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 45e51591..ddc9d0a4 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 579684aa..5225c43f 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 1dd73080..0bfa9914 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 0cf77791..196b6638 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 88808cdc..e1337dba 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 ad4efeb4..88159876 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 f993ac98..539cd50f 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 612e2a8e..f5ac1d9d 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 899e5bda..2c776671 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 a5a34f01..534fe730 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 cd442f0f..e43d3ac0 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 645eaa3d..070f6e1d 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 9f277161..85b4ab64 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 fb60a476..151d9fc3 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 91fab7de..d566da6b 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 3df12114..203b0bf8 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 af5ce97d..738c1fda 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 3a7f428e..8740db61 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 2992d634..a434794b 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 9f6bc071..6c18a606 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 0dc365b8..dc6b3038 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 868a86a2..ab8b4989 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 973a9410..199a419f 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 4a4df3ad..f7cb695a 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 c444a44d..1eb5ca12 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 db66f1cb..b877fb88 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 179770b3..454da87c 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 5e29c0a0..4696e8c4 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 d4e79e03..61dd1aa0 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 3c76ce2e..9c4a777b 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 0e31a1f9..4d040a4e 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 d84176af..9bef7680 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 63abbc03..9c67fff3 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 ceccc492..18fbf23a 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 43d99af4..a6cc9ed9 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 20550923..5249c494 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 0ee4a3a6..ce986f20 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 1182287a..6b6b302a 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 d92a34c7..9a11ba49 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 bcf70017..bb00a480 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 72fc4945..6f094fed 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 dc426ef8..dd90d7e9 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 53e3de94..c5a9e465 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 7f3ff96b..08e1621e 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 710e7dcc..29016424 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 adc8f516..fcce20c4 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 18a7cb39..66d9c2dd 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 3cdf59b5..d9fdb85a 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 c2bb1e9f..ba9354dc 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 91e72f75..aadeeebc 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 5964d460..94eb05d5 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 351961c5..3659f41e 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 120843dd..e1ce907f 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 67e421d3..ec18a82e 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 73f8d011..b352d019 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 47fd071d..5cf721c2 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 c686d822..bf79fc88 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 447771fc..31366e59 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 eca38813..93e1f768 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 cd577431..ef7d1ffc 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 82180f83..8225282e 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 4c3414ed..4f39b580 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 c5bd56d4..7bede4dc 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 bf650575..476a5bf9 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 00181102..421eb77f 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 1d728287..9de1491e 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 c89628ee..9f0654e3 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 dbc3aec8..5f198aed 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 2e9407ee..17162411 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 e466361e..d7af405f 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 b6f21642..6de5944d 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 dc0a1ef2..d473d1ea 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 a60dbdda..36c1d1b4 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 1e3d8f89..d3eae491 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 bc5e1003..06ccd8ce 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 d071d67c..728f8e3d 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 c4310c94..4e6f05b5 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 b42e6a31..777113da 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 a5a3e950..d5152dd4 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 513499b5..2eaf88b8 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 e1282f37..26e09459 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 9cc23f67..8cac9033 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 669c5ac8..e816a190 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 c63b5322..9c028b4e 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 1b1e3cbe..b8393abc 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 649d496c..27e3ecca 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 fa594d6c..32c0fa22 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 993068c6..ce57f114 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 520a414e..3582b6d8 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 4eb6ddf6..01f1dcd6 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 5c8643f2..61005fa0 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 00787abb..534c5e75 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 338dc9bb..3bee03d9 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 b214609f..6f83d450 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 b48f062c..bcd70308 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 0e3f29eb..a40ee4f7 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 2eb62fb0..15f6c9e3 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 77fea226..b512b0e5 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 c0780c40..bd2d966a 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 fac1b6e4..5d803e44 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 2dd1d257..5c00985d 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 0d1966ac..2d36f125 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 edfab5c9..be45f510 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 0247422b..7ec41e97 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 dc3cf40d..eb3adabd 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 865a2393..08a563de 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 7941cf76..c749b415 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 8065d3bc..04d92a41 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 d699c63b..c99874e2 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 3d6b90c5..c0410d3e 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 5a20d53f..3d9daa26 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 e951a34b..000319b1 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 99940759..b0ad9aaf 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 6a5cd629..6a193a75 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 2a62a7f2..c2ca9af6 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 fe971271..2cc49964 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 c32481fd..ae14bae3 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 92a9455d..c6b4db32 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 089db280..56e31a6e 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 0ca9f055..e70be43b 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 13e0b8b2..533080ef 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 168f6122..b1cc3276 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 d5d23c16..f0eede28 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 e88389fc..776e1f05 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 1c435f1c..88f09804 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 9ad89263..ef8ed3e6 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 2d642918..ee80d9bb 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 92ebb372..4d8c9c56 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 24d736f8..9996576e 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 30338924..d9bda8c8 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 62045870..c3435d57 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 3595160e..2f237d7d 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 14865bcf..d94cbee7 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 4827552a..3ae5616f 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 defa10b9..9725d3fc 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 d1ca1f8d..467888b2 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 2ce55374..927a722c 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 ce099541..8ad8c7c5 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 880c079d..7f1b926f 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 b1547da7..c3d30c31 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 490d11b6..7ff76467 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 c592c15b..214554d3 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 c198e930..472e0894 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 436860a4..6dc8a200 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 0b239f03..28aa8b20 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 70ebe84d..4b0329b0 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 cd4d322e..96e7e5fd 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 8bb5607c..8b7b9afa 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 6767e48d..90b15444 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 6683173b..3ec71673 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 1c76ec2f..813580fb 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 704125e0..b6a8915f 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 4a4ceef9..e554366f 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 1131fd21..685f5332 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 609e7e80..c373a7f2 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 060b64d0..f08a8692 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 052eda65..b19379c4 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 fe0b3892..519630fb 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 9046f550..6ce4a06b 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 f83f0777..076c302c 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 3c87da5f..2f3efe49 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 e4e74287..75f22dd5 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 215a0fef..35804c06 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 e543d90f..6f1ba19a 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 617dfa98..5740e667 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 1541754c..1deeeb8b 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 818fb476..2ee0ae70 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 c96caa12..8f010aa9 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 48318e80..84980393 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 32a36a10..f083641b 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 a691ebe5..a766adf8 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 03b3b490..93cc3d9a 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 4deab1ae..ba8a2d48 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 a7c5dac3..bb2b27b0 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 830712ac..d6c3b04b 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 3bc9a1af..5c2ff575 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 2748df43..fa948c78 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 c3094a5a..8e60f227 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 c5ad2875..3dcc96c2 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 5b744f79..48c01a03 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 a0e5ccad..dfa2a9bf 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 3e1e6764..74e68bec 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 81989909..9e765480 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 f49cad94..d0cd7fd7 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 cb888f05..e7339423 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 9a52df96..7deecb6a 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 098fb30d..e5e6cb5e 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 f0243b05..55931386 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 3978b50b..78507ffb 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 604bba39..7de52a7d 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 1cb8a09c..306b7e2f 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 db07f934..719dd1fa 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 4d93ed72..e5d5c760 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 46e1eee2..5db11c41 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 678b62f1..3969c6a0 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 2803fadf..5dffbfdc 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 4ea1bfc5..3c7984c7 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 aee40e8e..64d7cf62 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 f423bb7c..6bca1a1f 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 371752a0..dd893440 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 03e65004..ff89cf5f 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 ec134575..d8835e89 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 3e186c12..4985d4bd 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 40d32b74..2a0b7396 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 3cd0ef79..26d6f329 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 fd4ae62e..802fedbb 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 cd41e781..5575a803 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 48768f9a..ca902fdc 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 323821b8..f62bc4a1 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 b994de8a..e7439acf 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 f4ea91a3..cb92a254 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 677cdb86..b61b6e09 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 a3bd23d9..59de3b0f 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 854e25ed..3efae683 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 f55fed91..0f6fa850 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 e7738a6b..90c22032 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 d74b13ff..1c32b1b8 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 41195651..fb7d7835 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 05a40a3a..a9126d4b 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 7859bd92..d0d323e9 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 256173c1..234f19fd 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 bf46a726..30cf3ba4 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 9040273c..212b891d 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 873ea11d..e9e843c6 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 d6f60ac0..d57d9ca0 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 5a615a03..d67df1ca 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 8ddb4808..2da90b69 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 03eba1d4..8835370b 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 02462fa4..0452f5db 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 6ecc0cc2..53eccf11 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 05e076f8..84b9d271 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 7e7836ab..ebd9e852 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 44be4d52..c77439f7 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 d9f84991..0b9eeb0a 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 9124fa78..d5c21396 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 8bc60fa4..cf79797d 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 66da8fd7..70de4d0c 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 e312108c..e572fad7 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 88e6bd27..d6d9efea 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 2d7d05f3..bc6890dc 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 fed16c05..3d502674 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 139db2b4..a1d71361 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 488389db..b6368965 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 95c2ab16..f22d0ce7 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 4b1c6ba3..7edd0925 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 b03bae76..ed294191 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 5abd99e3..bc6596e4 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 32f6cc4c..18075fda 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 5822185a..8a08e3aa 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 bf4eb9d0..c0edde4c 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 362b5529..016ed733 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 e3650146..ab03abb1 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 12fecfa5..a7421af6 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 cf6b317b..1ddae59b 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 fbf9ae6e..265461cd 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 d08089c8..f8bbd3c0 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 ebd18234..6b79d259 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 6b11d800..c2327167 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 7306a50e..3df5db3a 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 42ba575f..8e51bd8c 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 fed39f8b..a204fddd 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 11661e85..b5a90f53 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 dc207a2a..25f1b358 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 5a7411db..d7f8eb26 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 0c3d6c58..77c55797 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 85fc3a64..d6d5ccbb 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 fae86e12..1acba1c1 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 29e62a4f..828d437a 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 6ba8254d..2cf0bdcb 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 fe905e26..d9228f6b 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 8e25fe6f..0af8d7c4 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 e7ffb0b3..142d19ab 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 67d31e6e..c058fe8d 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 89869233..f8278c0c 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 662b6340..8419b6d2 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 851c5b00..b5e6e032 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 ebedf338..2746bed7 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 536c683b..a41e00f3 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 b7b00d91..491ff3a7 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 80ff2550..fbcda5b8 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 4779477f..4f507081 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 c6e616b9..8d437667 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 7134d471..f4d46378 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 8202a387..7b55d20a 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 1999c63e..3460046b 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 5fa2aa6c..45622c39 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 233fe5b9..11985f58 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 2ab3d996..e92430c4 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 ea6019c1..830fb054 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 86534564..3655775e 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 d03cd054..b071c639 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 34aa593f..34695bc8 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 6b4dd1ee..579e5213 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 7de47d48..1d60dd3b 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 5fcbaf39..c67c8f55 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 579113a7..bf73ca14 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 4631a535..bd62c1cf 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 e132159d..9800d97d 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 94be8a4c..405e3466 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 d6d6ee64..09e04195 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 0d8c6521..535016ed 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 45e8462a..f8c8476c 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 ee9e7431..b7e9c266 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 e69de29b..772e5dd2 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 0ac37512..ac970537 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 71a7cbdb..98962042 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 0456d0da..00000000 --- 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 06c6302e..1fd9cc6a 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 a63e1bfc..b2abff30 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 45105c50..594e1ba4 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 2a2d3097..d6ac6363 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 9a3b0583..f403c70f 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 6f2531e7..c2ed23fe 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 b5a5b8cd..887672b4 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 743aff17..affbc1af 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 ac7cc1b6..1e46f575 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 2cc9d02d..5f39a4de 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 4cb60465..c37bd868 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 411007fe..97be3ad3 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 7eb81d76..bde80076 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 c42634f1..ac806ec8 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 5cd4c34a..c7c09bb4 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 9cd20cb3..8b2d102b 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 8d871c9d..24028834 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 071f339c..a0ae91b6 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 00fbb91b..ffea7420 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 f8c0df2c..a20d17c4 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 cecbfbe6..0dccd2f2 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 |