diff --git a/share/man/man9/PCI_IOV_ADD_VF.9 b/share/man/man9/PCI_IOV_ADD_VF.9 index d13cb6e1ddc..512b0b8668c 100644 --- a/share/man/man9/PCI_IOV_ADD_VF.9 +++ b/share/man/man9/PCI_IOV_ADD_VF.9 @@ -31,7 +31,7 @@ .Nd inform a PF driver that a VF is being created .Sh SYNOPSIS .In sys/bus.h -.In machine/stdarg.h +.In sys/stdarg.h .In sys/nv.h .In dev/pci/pci_iov.h .Ft int diff --git a/share/man/man9/PCI_IOV_INIT.9 b/share/man/man9/PCI_IOV_INIT.9 index 66b1e693ced..8ce94800f6d 100644 --- a/share/man/man9/PCI_IOV_INIT.9 +++ b/share/man/man9/PCI_IOV_INIT.9 @@ -31,7 +31,7 @@ .Nd enable SR-IOV on a PF device .Sh SYNOPSIS .In sys/bus.h -.In machine/stdarg.h +.In sys/stdarg.h .In sys/nv.h .In dev/pci/pci_iov.h .Ft int diff --git a/share/man/man9/pci_iov_schema.9 b/share/man/man9/pci_iov_schema.9 index 764d357fbae..99589b59fb9 100644 --- a/share/man/man9/pci_iov_schema.9 +++ b/share/man/man9/pci_iov_schema.9 @@ -38,7 +38,7 @@ .Nm pci_iov_schema_add_unicast_mac .Nd PCI SR-IOV config schema interface .Sh SYNOPSIS -.In machine/stdarg.h +.In sys/stdarg.h .In sys/nv.h .In sys/iov_schema.h .Ft nvlist_t * diff --git a/stand/common/dev_net.c b/stand/common/dev_net.c index 3cd78c5346a..fc6b43ec7a4 100644 --- a/stand/common/dev_net.c +++ b/stand/common/dev_net.c @@ -47,9 +47,10 @@ * for use by the NFS open code (NFS/lookup). */ -#include #include #include +#include + #include #include #include diff --git a/stand/common/md.c b/stand/common/md.c index d12429c3c45..2c3eb5ded19 100644 --- a/stand/common/md.c +++ b/stand/common/md.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "bootstrap.h" diff --git a/stand/efi/boot1/boot1.c b/stand/efi/boot1/boot1.c index 908baf40097..b93c6b42516 100644 --- a/stand/efi/boot1/boot1.c +++ b/stand/efi/boot1/boot1.c @@ -20,8 +20,10 @@ */ #include +#include + #include -#include + #include #include diff --git a/stand/efi/boot1/proto.c b/stand/efi/boot1/proto.c index 6660d39a921..f81debd168b 100644 --- a/stand/efi/boot1/proto.c +++ b/stand/efi/boot1/proto.c @@ -20,8 +20,10 @@ */ #include +#include + #include -#include + #include #include diff --git a/stand/efi/gptboot/proto.c b/stand/efi/gptboot/proto.c index e2face6c23e..a1825d9c1c1 100644 --- a/stand/efi/gptboot/proto.c +++ b/stand/efi/gptboot/proto.c @@ -24,8 +24,10 @@ */ #include +#include + #include -#include + #include #include diff --git a/stand/i386/libi386/biosacpi.c b/stand/i386/libi386/biosacpi.c index 077b6c7e53d..8ddd322b9f9 100644 --- a/stand/i386/libi386/biosacpi.c +++ b/stand/i386/libi386/biosacpi.c @@ -25,7 +25,7 @@ */ #include -#include +#include #include #include #include "libi386.h" diff --git a/stand/i386/libi386/biospci.c b/stand/i386/libi386/biospci.c index 5b39eab1e5e..a89a6d30a1e 100644 --- a/stand/i386/libi386/biospci.c +++ b/stand/i386/libi386/biospci.c @@ -31,7 +31,7 @@ */ #include -#include +#include #include #include #include diff --git a/stand/i386/libi386/biospnp.c b/stand/i386/libi386/biospnp.c index 5b22f066d4e..c01d2888a9f 100644 --- a/stand/i386/libi386/biospnp.c +++ b/stand/i386/libi386/biospnp.c @@ -29,7 +29,7 @@ */ #include -#include +#include #include #include #include diff --git a/stand/liblua/lstd.h b/stand/liblua/lstd.h index ce3aef4bc5f..2b601f12956 100644 --- a/stand/liblua/lstd.h +++ b/stand/liblua/lstd.h @@ -29,10 +29,10 @@ #include #include +#include #include #include #include -#include /* * Mini stdio FILE and DIR routines. These are the minimal routines needed by diff --git a/stand/libofw/ofw_disk.c b/stand/libofw/ofw_disk.c index fc4c25bd942..d4bce64d9be 100644 --- a/stand/libofw/ofw_disk.c +++ b/stand/libofw/ofw_disk.c @@ -28,11 +28,10 @@ */ #include +#include #include -#include - #include #include diff --git a/stand/libofw/openfirm.c b/stand/libofw/openfirm.c index 58e7d8cbe75..1df65784e47 100644 --- a/stand/libofw/openfirm.c +++ b/stand/libofw/openfirm.c @@ -56,8 +56,7 @@ */ #include - -#include +#include #include diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index 42ef3e69c18..f5a1acea843 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -209,8 +209,8 @@ beforedepend: for i in ${SAFE_INCS}; do \ ln -sf ${SRCTOP}/include/$$i $$i; \ done; \ - ln -sf ${SYSDIR}/${MACHINE}/include/stdarg.h stdarg.h; \ ln -sf ${SYSDIR}/sys/errno.h errno.h; \ + ln -sf ${SYSDIR}/sys/stdarg.h stdarg.h; \ ln -sf ${SYSDIR}/sys/stdint.h stdint.h; \ ln -sf ${SRCTOP}/include/arpa/inet.h arpa/inet.h; \ ln -sf ${SRCTOP}/include/arpa/tftp.h arpa/tftp.h; \ diff --git a/stand/libsa/panic.c b/stand/libsa/panic.c index 319f08094d9..a555743f041 100644 --- a/stand/libsa/panic.c +++ b/stand/libsa/panic.c @@ -34,7 +34,7 @@ */ #include -#include +#include /* * Boot loaders and other standalone programs that wish to have a diff --git a/stand/libsa/printf.c b/stand/libsa/printf.c index a84c5431f53..053b54d31ef 100644 --- a/stand/libsa/printf.c +++ b/stand/libsa/printf.c @@ -37,18 +37,13 @@ */ #include +#include #include #include #include #include #include "stand.h" -/* - * Note that stdarg.h and the ANSI style va_start macro is used for both - * ANSI and traditional C compilers. - */ -#include - #define MAXNBUF (sizeof(intmax_t) * CHAR_BIT + 1) typedef void (kvprintf_fn_t)(int, void *); diff --git a/stand/powerpc/boot1.chrp/boot1.c b/stand/powerpc/boot1.chrp/boot1.c index cdacb05c31c..1a546f3473e 100644 --- a/stand/powerpc/boot1.chrp/boot1.c +++ b/stand/powerpc/boot1.chrp/boot1.c @@ -18,9 +18,11 @@ #include #include #include +#include + #include -#include #include + #include #include "paths.h" diff --git a/stand/uboot/uboot_disk.c b/stand/uboot/uboot_disk.c index 4f7b6ba0694..1f75f0f6da3 100644 --- a/stand/uboot/uboot_disk.c +++ b/stand/uboot/uboot_disk.c @@ -33,7 +33,8 @@ #include #include -#include +#include + #include #include "api_public.h" diff --git a/sys/amd64/linux/linux_vdso_gtod.c b/sys/amd64/linux/linux_vdso_gtod.c index 519ca2f2de9..abe42d51a3a 100644 --- a/sys/amd64/linux/linux_vdso_gtod.c +++ b/sys/amd64/linux/linux_vdso_gtod.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #define _KERNEL #include @@ -36,7 +37,6 @@ #include #include -#include #include #include diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c index ec5851c45c2..f32db30057d 100644 --- a/sys/amd64/linux32/linux32_vdso_gtod.c +++ b/sys/amd64/linux32/linux32_vdso_gtod.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #define _KERNEL #include @@ -36,7 +37,6 @@ #include #include -#include #include #include diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c index ea8f9c18490..dc3d8b1f902 100644 --- a/sys/arm/ti/cpsw/if_cpsw.c +++ b/sys/arm/ti/cpsw/if_cpsw.c @@ -59,11 +59,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/arm/xilinx/zy7_devcfg.c b/sys/arm/xilinx/zy7_devcfg.c index 6df0fba1f56..41618225a56 100644 --- a/sys/arm/xilinx/zy7_devcfg.c +++ b/sys/arm/xilinx/zy7_devcfg.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -49,7 +50,6 @@ #include #include -#include #include #include diff --git a/sys/arm/xilinx/zy7_ehci.c b/sys/arm/xilinx/zy7_ehci.c index 545e2a9bce1..6d84ec751e0 100644 --- a/sys/arm/xilinx/zy7_ehci.c +++ b/sys/arm/xilinx/zy7_ehci.c @@ -45,10 +45,10 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/arm/xilinx/zy7_gpio.c b/sys/arm/xilinx/zy7_gpio.c index 091237014c6..71b6fc3c058 100644 --- a/sys/arm/xilinx/zy7_gpio.c +++ b/sys/arm/xilinx/zy7_gpio.c @@ -53,11 +53,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/arm/xilinx/zy7_qspi.c b/sys/arm/xilinx/zy7_qspi.c index 49d4cafd8d6..42091bc7861 100644 --- a/sys/arm/xilinx/zy7_qspi.c +++ b/sys/arm/xilinx/zy7_qspi.c @@ -42,11 +42,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/arm/xilinx/zy7_slcr.c b/sys/arm/xilinx/zy7_slcr.c index a46ccb59a07..40bcff49162 100644 --- a/sys/arm/xilinx/zy7_slcr.c +++ b/sys/arm/xilinx/zy7_slcr.c @@ -42,12 +42,12 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/arm/xilinx/zy7_spi.c b/sys/arm/xilinx/zy7_spi.c index bb5bb7f4676..636a40d729d 100644 --- a/sys/arm/xilinx/zy7_spi.c +++ b/sys/arm/xilinx/zy7_spi.c @@ -34,11 +34,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/arm64/linux/linux_vdso_gtod.c b/sys/arm64/linux/linux_vdso_gtod.c index f7def68d88c..203c76b6e3a 100644 --- a/sys/arm64/linux/linux_vdso_gtod.c +++ b/sys/arm64/linux/linux_vdso_gtod.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #define _KERNEL #include @@ -36,7 +37,6 @@ #include #include -#include #include #include diff --git a/sys/arm64/qoriq/qoriq_gpio_pic.c b/sys/arm64/qoriq/qoriq_gpio_pic.c index ec84d2a14ae..aca8b9daea1 100644 --- a/sys/arm64/qoriq/qoriq_gpio_pic.c +++ b/sys/arm64/qoriq/qoriq_gpio_pic.c @@ -34,11 +34,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 61cffeda6f0..e33e1fafa27 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -57,7 +58,6 @@ #include #include #include -#include /* for xpt_print below */ struct ata_quirk_entry { struct scsi_inquiry_pattern inq_pat; diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 8428125d5e9..38bc82c69aa 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -68,7 +69,6 @@ #include #include -#include /* for xpt_print below */ /* Wild guess based on not wanting to grow the stack too much */ #define XPT_PRINT_MAXLEN 512 diff --git a/sys/cam/ctl/ctl_error.c b/sys/cam/ctl/ctl_error.c index d07541a1a98..debc6b1e29e 100644 --- a/sys/cam/ctl/ctl_error.c +++ b/sys/cam/ctl/ctl_error.c @@ -49,8 +49,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/sys/cam/ctl/ctl_error.h b/sys/cam/ctl/ctl_error.h index fb2113bef04..55fb8e30b5e 100644 --- a/sys/cam/ctl/ctl_error.h +++ b/sys/cam/ctl/ctl_error.h @@ -39,7 +39,7 @@ * Author: Ken Merry */ -#include +#include #ifndef _CTL_ERROR_H_ #define _CTL_ERROR_H_ diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c index b7f1e5bce86..138f96eaaa4 100644 --- a/sys/cam/mmc/mmc_xpt.c +++ b/sys/cam/mmc/mmc_xpt.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -58,7 +59,6 @@ #include #include -#include /* for xpt_print below */ #include /* for PRIu64 */ FEATURE(mmccam, "CAM-based MMC/SD/SDIO stack"); diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index bac9e644104..f6667df07be 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -57,7 +58,6 @@ #include #include #include -#include /* for xpt_print below */ struct nvme_quirk_entry { u_int quirks; diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h index 944f70e03da..b6fb66beefc 100644 --- a/sys/cam/scsi/scsi_all.h +++ b/sys/cam/scsi/scsi_all.h @@ -18,7 +18,7 @@ #ifdef _KERNEL #include -#include +#include #else #include #endif diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c index 4415e940cd9..9705a0b890b 100644 --- a/sys/cam/scsi/scsi_enc.c +++ b/sys/cam/scsi/scsi_enc.c @@ -39,14 +39,13 @@ #include #include #include +#include #include #include #include #include #include -#include - #include #include #include diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c index 21cb6beaf1f..2bb59cb2d92 100644 --- a/sys/cam/scsi/scsi_xpt.c +++ b/sys/cam/scsi/scsi_xpt.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -59,7 +60,6 @@ #include #include #include -#include /* for xpt_print below */ struct scsi_quirk_entry { struct scsi_inquiry_pattern inq_pat; diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_string.c b/sys/cddl/compat/opensolaris/kern/opensolaris_string.c index ec088f216cb..4c8eb533e93 100644 --- a/sys/cddl/compat/opensolaris/kern/opensolaris_string.c +++ b/sys/cddl/compat/opensolaris/kern/opensolaris_string.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #define IS_DIGIT(c) ((c) >= '0' && (c) <= '9') diff --git a/sys/cddl/compat/opensolaris/sys/cmn_err.h b/sys/cddl/compat/opensolaris/sys/cmn_err.h index 2623693ec8b..b3ebf6414e8 100644 --- a/sys/cddl/compat/opensolaris/sys/cmn_err.h +++ b/sys/cddl/compat/opensolaris/sys/cmn_err.h @@ -28,7 +28,7 @@ #define _OPENSOLARIS_SYS_CMN_ERR_H_ #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/sys/cddl/compat/opensolaris/sys/varargs.h b/sys/cddl/compat/opensolaris/sys/varargs.h index 9684502756c..bede89fafa1 100644 --- a/sys/cddl/compat/opensolaris/sys/varargs.h +++ b/sys/cddl/compat/opensolaris/sys/varargs.h @@ -28,7 +28,7 @@ #define _OPENSOLARIS_SYS_VARARGS_H_ #ifdef _KERNEL -#include +#include #else #include #endif diff --git a/sys/cddl/dev/fbt/fbt.c b/sys/cddl/dev/fbt/fbt.c index 99a77ba65eb..da9c4ee2ab7 100644 --- a/sys/cddl/dev/fbt/fbt.c +++ b/sys/cddl/dev/fbt/fbt.c @@ -49,12 +49,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/sys/cddl/dev/profile/profile.c b/sys/cddl/dev/profile/profile.c index 3e106aab1c8..23a8c925670 100644 --- a/sys/cddl/dev/profile/profile.c +++ b/sys/cddl/dev/profile/profile.c @@ -48,11 +48,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/cddl/dev/systrace/systrace.c b/sys/cddl/dev/systrace/systrace.c index c14a663d199..d8fe1a6430c 100644 --- a/sys/cddl/dev/systrace/systrace.c +++ b/sys/cddl/dev/systrace/systrace.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -54,8 +55,6 @@ #include -#include - #ifdef LINUX_SYSTRACE #if defined(__amd64__) #include diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index e0c010cb5e4..91080048987 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -40,11 +40,10 @@ #include #include #include +#include #include #include -#include - #include #include #include diff --git a/sys/compat/linuxkpi/common/include/linux/kmod.h b/sys/compat/linuxkpi/common/include/linux/kmod.h index b3cbe2ed2e0..8f9f034aabd 100644 --- a/sys/compat/linuxkpi/common/include/linux/kmod.h +++ b/sys/compat/linuxkpi/common/include/linux/kmod.h @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #define request_module(...) \ diff --git a/sys/compat/linuxkpi/common/include/linux/kobject.h b/sys/compat/linuxkpi/common/include/linux/kobject.h index 512f47f9e4b..98f55d1234c 100644 --- a/sys/compat/linuxkpi/common/include/linux/kobject.h +++ b/sys/compat/linuxkpi/common/include/linux/kobject.h @@ -29,7 +29,7 @@ #ifndef _LINUXKPI_LINUX_KOBJECT_H_ #define _LINUXKPI_LINUX_KOBJECT_H_ -#include +#include #include #include diff --git a/sys/compat/linuxkpi/common/include/linux/stdarg.h b/sys/compat/linuxkpi/common/include/linux/stdarg.h index ab2fdf7534e..698ac45e919 100644 --- a/sys/compat/linuxkpi/common/include/linux/stdarg.h +++ b/sys/compat/linuxkpi/common/include/linux/stdarg.h @@ -28,6 +28,6 @@ #ifndef _LINUXKPI_STDARG_H_ #define _LINUXKPI_STDARG_H_ -#include +#include #endif /* _LINUXKPI_STDARG_H_ */ diff --git a/sys/compat/linuxkpi/common/include/stdarg.h b/sys/compat/linuxkpi/common/include/stdarg.h index ab2fdf7534e..698ac45e919 100644 --- a/sys/compat/linuxkpi/common/include/stdarg.h +++ b/sys/compat/linuxkpi/common/include/stdarg.h @@ -28,6 +28,6 @@ #ifndef _LINUXKPI_STDARG_H_ #define _LINUXKPI_STDARG_H_ -#include +#include #endif /* _LINUXKPI_STDARG_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index ae15fc553ec..dcdec0dfcc7 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -61,8 +62,6 @@ #include #include -#include - #if defined(__i386__) || defined(__amd64__) #include #include diff --git a/sys/compat/linuxkpi/common/src/linux_idr.c b/sys/compat/linuxkpi/common/src/linux_idr.c index 59c37519468..664177835c8 100644 --- a/sys/compat/linuxkpi/common/src/linux_idr.c +++ b/sys/compat/linuxkpi/common/src/linux_idr.c @@ -34,8 +34,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index fe99c0ecf05..55202da0044 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -43,13 +43,13 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/contrib/dev/acpica/include/platform/acfreebsd.h b/sys/contrib/dev/acpica/include/platform/acfreebsd.h index e81a5d40bcd..b537a25f9fb 100644 --- a/sys/contrib/dev/acpica/include/platform/acfreebsd.h +++ b/sys/contrib/dev/acpica/include/platform/acfreebsd.h @@ -179,10 +179,10 @@ #include #include +#include #include #include #include -#include #include "opt_acpi.h" diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c index a977d7941aa..c73bc218912 100644 --- a/sys/contrib/libnv/bsd_nvpair.c +++ b/sys/contrib/libnv/bsd_nvpair.c @@ -42,10 +42,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include -#include - #else #include #include diff --git a/sys/contrib/libnv/cnvlist.c b/sys/contrib/libnv/cnvlist.c index 6597be30c9f..5fbc731f9b6 100644 --- a/sys/contrib/libnv/cnvlist.c +++ b/sys/contrib/libnv/cnvlist.c @@ -38,8 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - -#include +#include #else #include diff --git a/sys/contrib/libnv/dnvlist.c b/sys/contrib/libnv/dnvlist.c index 0472deabd15..7c58979e023 100644 --- a/sys/contrib/libnv/dnvlist.c +++ b/sys/contrib/libnv/dnvlist.c @@ -38,8 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - -#include +#include #else #include diff --git a/sys/contrib/libnv/nvlist.c b/sys/contrib/libnv/nvlist.c index 00ba3b41f3a..41edc72322c 100644 --- a/sys/contrib/libnv/nvlist.c +++ b/sys/contrib/libnv/nvlist.c @@ -44,8 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - -#include +#include #else #include diff --git a/sys/contrib/ncsw/inc/stdarg_ext.h b/sys/contrib/ncsw/inc/stdarg_ext.h index 7379a4e5ed5..2515c4cfe90 100644 --- a/sys/contrib/ncsw/inc/stdarg_ext.h +++ b/sys/contrib/ncsw/inc/stdarg_ext.h @@ -40,7 +40,7 @@ #elif defined(NCSW_FREEBSD) #include #include -#include +#include #else #include diff --git a/sys/contrib/ncsw/user/env/xx.c b/sys/contrib/ncsw/user/env/xx.c index ecfe052e596..0a502c64e2f 100644 --- a/sys/contrib/ncsw/user/env/xx.c +++ b/sys/contrib/ncsw/user/env/xx.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -45,7 +46,6 @@ #include #include #include -#include #include #include diff --git a/sys/contrib/openzfs/module/os/freebsd/spl/spl_string.c b/sys/contrib/openzfs/module/os/freebsd/spl/spl_string.c index aee506f2861..a92068aa1cd 100644 --- a/sys/contrib/openzfs/module/os/freebsd/spl/spl_string.c +++ b/sys/contrib/openzfs/module/os/freebsd/spl/spl_string.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #define IS_DIGIT(c) ((c) >= '0' && (c) <= '9') diff --git a/sys/contrib/rdma/krping/krping_dev.c b/sys/contrib/rdma/krping/krping_dev.c index 59aa1967244..2c69dbb5cf5 100644 --- a/sys/contrib/rdma/krping/krping_dev.c +++ b/sys/contrib/rdma/krping/krping_dev.c @@ -23,8 +23,8 @@ __FBSDID("$FreeBSD$"); #include /* uio struct */ #include #include +#include #include -#include #include "krping.h" diff --git a/sys/contrib/vchiq/interface/compat/vchi_bsd.c b/sys/contrib/vchiq/interface/compat/vchi_bsd.c index f831880f5e1..8f47b3dc02d 100644 --- a/sys/contrib/vchiq/interface/compat/vchi_bsd.c +++ b/sys/contrib/vchiq/interface/compat/vchi_bsd.c @@ -36,12 +36,11 @@ #include #include #include +#include #include #include #include -#include - #include "mbox_if.h" #include diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c index 4585b65df11..23a10d78c10 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -42,10 +42,9 @@ #include #include #include +#include #include -#include - #include #include diff --git a/sys/ddb/db_pprint.c b/sys/ddb/db_pprint.c index 0ca2b0bb952..d22b8ca12eb 100644 --- a/sys/ddb/db_pprint.c +++ b/sys/ddb/db_pprint.c @@ -29,8 +29,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/dev/aacraid/aacraid_debug.c b/sys/dev/aacraid/aacraid_debug.c index 0000e7d070a..ca008cc082f 100644 --- a/sys/dev/aacraid/aacraid_debug.c +++ b/sys/dev/aacraid/aacraid_debug.c @@ -51,13 +51,12 @@ #include #include #include - #include #include +#include #include #include -#include #include diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index d5ce503f62e..4ef3259dd10 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -37,8 +37,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 59bcca0b3d4..f29d803e99a 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -34,10 +34,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/sys/dev/ahci/ahciem.c b/sys/dev/ahci/ahciem.c index 97963784b56..c9e6c35f423 100644 --- a/sys/dev/ahci/ahciem.c +++ b/sys/dev/ahci/ahciem.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 5bfa1ce3a62..2e77c0f6478 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -37,11 +37,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/sys/dev/ata/ata-isa.c b/sys/dev/ata/ata-isa.c index 0b76c00e956..0255141b4d1 100644 --- a/sys/dev/ata/ata-isa.c +++ b/sys/dev/ata/ata-isa.c @@ -34,9 +34,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 6d8b8fb3aad..cb44f98c406 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -36,12 +36,15 @@ #include #include #include +#include #include + #include -#include + #include #include #include + #include #include #include diff --git a/sys/dev/ata/ata-sata.c b/sys/dev/ata/ata-sata.c index 57fea391825..b3155a5625c 100644 --- a/sys/dev/ata/ata-sata.c +++ b/sys/dev/ata/ata-sata.c @@ -36,9 +36,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-acard.c b/sys/dev/ata/chipsets/ata-acard.c index 80608879723..d1fc5ac028b 100644 --- a/sys/dev/ata/chipsets/ata-acard.c +++ b/sys/dev/ata/chipsets/ata-acard.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-acerlabs.c b/sys/dev/ata/chipsets/ata-acerlabs.c index c34affcabc3..7d602eda6f6 100644 --- a/sys/dev/ata/chipsets/ata-acerlabs.c +++ b/sys/dev/ata/chipsets/ata-acerlabs.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-amd.c b/sys/dev/ata/chipsets/ata-amd.c index 19fce249fc0..31776028ee3 100644 --- a/sys/dev/ata/chipsets/ata-amd.c +++ b/sys/dev/ata/chipsets/ata-amd.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-ati.c b/sys/dev/ata/chipsets/ata-ati.c index 27eaefa1dc9..154e55428af 100644 --- a/sys/dev/ata/chipsets/ata-ati.c +++ b/sys/dev/ata/chipsets/ata-ati.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-cenatek.c b/sys/dev/ata/chipsets/ata-cenatek.c index 96bb48d1c04..8f5012ed6ef 100644 --- a/sys/dev/ata/chipsets/ata-cenatek.c +++ b/sys/dev/ata/chipsets/ata-cenatek.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-cypress.c b/sys/dev/ata/chipsets/ata-cypress.c index d956f79b108..b43ea58f927 100644 --- a/sys/dev/ata/chipsets/ata-cypress.c +++ b/sys/dev/ata/chipsets/ata-cypress.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-cyrix.c b/sys/dev/ata/chipsets/ata-cyrix.c index e0921b2c334..12bfa3eec7c 100644 --- a/sys/dev/ata/chipsets/ata-cyrix.c +++ b/sys/dev/ata/chipsets/ata-cyrix.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-highpoint.c b/sys/dev/ata/chipsets/ata-highpoint.c index 23ddf05a5f5..9d6137829f6 100644 --- a/sys/dev/ata/chipsets/ata-highpoint.c +++ b/sys/dev/ata/chipsets/ata-highpoint.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c index 866ac03133a..f6ea4f8519f 100644 --- a/sys/dev/ata/chipsets/ata-intel.c +++ b/sys/dev/ata/chipsets/ata-intel.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-ite.c b/sys/dev/ata/chipsets/ata-ite.c index bbcaeee194a..3af1c376439 100644 --- a/sys/dev/ata/chipsets/ata-ite.c +++ b/sys/dev/ata/chipsets/ata-ite.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-jmicron.c b/sys/dev/ata/chipsets/ata-jmicron.c index 3a5c359dcd9..b1671c5aa26 100644 --- a/sys/dev/ata/chipsets/ata-jmicron.c +++ b/sys/dev/ata/chipsets/ata-jmicron.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-marvell.c b/sys/dev/ata/chipsets/ata-marvell.c index c17b0474454..c0c9bb71e5c 100644 --- a/sys/dev/ata/chipsets/ata-marvell.c +++ b/sys/dev/ata/chipsets/ata-marvell.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-micron.c b/sys/dev/ata/chipsets/ata-micron.c index 09245386551..c85fbd580cc 100644 --- a/sys/dev/ata/chipsets/ata-micron.c +++ b/sys/dev/ata/chipsets/ata-micron.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-national.c b/sys/dev/ata/chipsets/ata-national.c index eb5da805bc3..75f24610d91 100644 --- a/sys/dev/ata/chipsets/ata-national.c +++ b/sys/dev/ata/chipsets/ata-national.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-netcell.c b/sys/dev/ata/chipsets/ata-netcell.c index f112634f7ea..1bdff26f99e 100644 --- a/sys/dev/ata/chipsets/ata-netcell.c +++ b/sys/dev/ata/chipsets/ata-netcell.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-nvidia.c b/sys/dev/ata/chipsets/ata-nvidia.c index 6e1769375f6..5078ed35214 100644 --- a/sys/dev/ata/chipsets/ata-nvidia.c +++ b/sys/dev/ata/chipsets/ata-nvidia.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-promise.c b/sys/dev/ata/chipsets/ata-promise.c index 15c6ae84c1b..23b4d6d64b0 100644 --- a/sys/dev/ata/chipsets/ata-promise.c +++ b/sys/dev/ata/chipsets/ata-promise.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-serverworks.c b/sys/dev/ata/chipsets/ata-serverworks.c index c6a6a26959e..66487b4ff56 100644 --- a/sys/dev/ata/chipsets/ata-serverworks.c +++ b/sys/dev/ata/chipsets/ata-serverworks.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-siliconimage.c b/sys/dev/ata/chipsets/ata-siliconimage.c index 75c7961caeb..d5ecb8f3cf5 100644 --- a/sys/dev/ata/chipsets/ata-siliconimage.c +++ b/sys/dev/ata/chipsets/ata-siliconimage.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-sis.c b/sys/dev/ata/chipsets/ata-sis.c index b31d76fe3f7..b4861e694cb 100644 --- a/sys/dev/ata/chipsets/ata-sis.c +++ b/sys/dev/ata/chipsets/ata-sis.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-via.c b/sys/dev/ata/chipsets/ata-via.c index 4b7dd0f0855..7f23a5d6bf9 100644 --- a/sys/dev/ata/chipsets/ata-via.c +++ b/sys/dev/ata/chipsets/ata-via.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ath/ah_osdep.c b/sys/dev/ath/ah_osdep.c index b9098121629..6278d6dbdb8 100644 --- a/sys/dev/ath/ah_osdep.c +++ b/sys/dev/ath/ah_osdep.c @@ -42,8 +42,7 @@ #include #include #include - -#include +#include #include /* XXX for ether_sprintf */ diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_private.h b/sys/dev/bhnd/nvram/bhnd_nvram_private.h index 8513039c2c7..bbf646ff180 100644 --- a/sys/dev/bhnd/nvram/bhnd_nvram_private.h +++ b/sys/dev/bhnd/nvram/bhnd_nvram_private.h @@ -39,8 +39,7 @@ #ifdef _KERNEL #include - -#include +#include #else #include #include diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_value.h b/sys/dev/bhnd/nvram/bhnd_nvram_value.h index 3e7e94d9c81..f5c4e1e70b9 100644 --- a/sys/dev/bhnd/nvram/bhnd_nvram_value.h +++ b/sys/dev/bhnd/nvram/bhnd_nvram_value.h @@ -34,7 +34,7 @@ #include #ifdef _KERNEL -#include +#include #else /* !_KERNEL */ #include #endif /* _KERNEL */ diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c b/sys/dev/etherswitch/e6000sw/e6000sw.c index d26fc32ed6a..4ef510b85c7 100644 --- a/sys/dev/etherswitch/e6000sw/e6000sw.c +++ b/sys/dev/etherswitch/e6000sw/e6000sw.c @@ -51,7 +51,7 @@ #include #include #else -#include +#include #endif #include "e6000swreg.h" diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 431396e4453..58fcd1d5ea3 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -70,6 +70,7 @@ #include #include #include +#include #include #include @@ -77,7 +78,6 @@ #include #include -#include #include #include diff --git a/sys/dev/filemon/filemon_wrapper.c b/sys/dev/filemon/filemon_wrapper.c index 3095d197aca..dabb9eea192 100644 --- a/sys/dev/filemon/filemon_wrapper.c +++ b/sys/dev/filemon/filemon_wrapper.c @@ -33,12 +33,11 @@ #include #include #include +#include #include #include #include -#include - static void filemon_output_event(struct filemon *filemon, const char *fmt, ...) __printflike(2, 3); diff --git a/sys/dev/gpio/qoriq_gpio.c b/sys/dev/gpio/qoriq_gpio.c index 63a9c3f857f..25dfccede29 100644 --- a/sys/dev/gpio/qoriq_gpio.c +++ b/sys/dev/gpio/qoriq_gpio.c @@ -35,10 +35,10 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/dev/hpt27xx/os_bsd.h b/sys/dev/hpt27xx/os_bsd.h index b92cd06e9f0..96c62ae0910 100644 --- a/sys/dev/hpt27xx/os_bsd.h +++ b/sys/dev/hpt27xx/os_bsd.h @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -59,7 +60,6 @@ #include #include #include -#include #include #include diff --git a/sys/dev/hptiop/hptiop.c b/sys/dev/hptiop/hptiop.c index 8252dbad4a0..b7b885a7c73 100644 --- a/sys/dev/hptiop/hptiop.c +++ b/sys/dev/hptiop/hptiop.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -49,7 +50,6 @@ #include #include -#include #include #include diff --git a/sys/dev/hptmv/hptproc.c b/sys/dev/hptmv/hptproc.c index 8f9fffdc5af..38fe61ee7e0 100644 --- a/sys/dev/hptmv/hptproc.c +++ b/sys/dev/hptmv/hptproc.c @@ -32,8 +32,8 @@ #include #include #include +#include #include -#include #ifndef __KERNEL__ #define __KERNEL__ diff --git a/sys/dev/hptnr/os_bsd.h b/sys/dev/hptnr/os_bsd.h index 75ac04323d5..d262980721d 100644 --- a/sys/dev/hptnr/os_bsd.h +++ b/sys/dev/hptnr/os_bsd.h @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -61,7 +62,6 @@ #include #include #include -#include #include #include diff --git a/sys/dev/hptrr/os_bsd.h b/sys/dev/hptrr/os_bsd.h index b351a13cba3..927c73ab47f 100644 --- a/sys/dev/hptrr/os_bsd.h +++ b/sys/dev/hptrr/os_bsd.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -62,7 +63,6 @@ #include #include -#include #include #include diff --git a/sys/dev/hyperv/vmbus/vmbus_chan.c b/sys/dev/hyperv/vmbus/vmbus_chan.c index 5ce6e545158..189a3e66a03 100644 --- a/sys/dev/hyperv/vmbus/vmbus_chan.c +++ b/sys/dev/hyperv/vmbus/vmbus_chan.c @@ -34,11 +34,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/dev/iavf/iavf_iflib.h b/sys/dev/iavf/iavf_iflib.h index ec083d66a20..83891f9ed52 100644 --- a/sys/dev/iavf/iavf_iflib.h +++ b/sys/dev/iavf/iavf_iflib.h @@ -52,6 +52,7 @@ #include #include #include +#include #include #include @@ -94,7 +95,6 @@ #include #include #include -#include #include #include #include "ifdi_if.h" diff --git a/sys/dev/iavf/iavf_lib.h b/sys/dev/iavf/iavf_lib.h index 2f874b2e441..48c0f4560e5 100644 --- a/sys/dev/iavf/iavf_lib.h +++ b/sys/dev/iavf/iavf_lib.h @@ -40,7 +40,7 @@ #define _IAVF_LIB_H_ #include -#include +#include #include #ifdef RSS #include diff --git a/sys/dev/iavf/iavf_osdep.c b/sys/dev/iavf/iavf_osdep.c index 1c3aefe253a..b81fded4892 100644 --- a/sys/dev/iavf/iavf_osdep.c +++ b/sys/dev/iavf/iavf_osdep.c @@ -37,7 +37,7 @@ * independent layer for sharing code between drivers on different operating * systems. */ -#include +#include #include "iavf_iflib.h" diff --git a/sys/dev/ice/ice_osdep.c b/sys/dev/ice/ice_osdep.c index 88b4984c290..bb3d4ef9804 100644 --- a/sys/dev/ice/ice_osdep.c +++ b/sys/dev/ice/ice_osdep.c @@ -40,7 +40,7 @@ #include "ice_common.h" #include "ice_iflib.h" -#include +#include #include /** diff --git a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c index bf1f88ec9ca..ad18ff39961 100644 --- a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c +++ b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c @@ -42,11 +42,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/dev/ioat/ioat.c b/sys/dev/ioat/ioat.c index e38b20c005f..c658eeb4fe0 100644 --- a/sys/dev/ioat/ioat.c +++ b/sys/dev/ioat/ioat.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -51,7 +52,6 @@ #include #include #include -#include #ifdef DDB #include diff --git a/sys/dev/ioat/ioat_test.c b/sys/dev/ioat/ioat_test.c index 6ff3494a76d..958297f65a5 100644 --- a/sys/dev/ioat/ioat_test.c +++ b/sys/dev/ioat/ioat_test.c @@ -35,12 +35,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/sys/dev/isci/isci_logger.c b/sys/dev/isci/isci_logger.c index 62685d52faf..b5653603a04 100644 --- a/sys/dev/isci/isci_logger.c +++ b/sys/dev/isci/isci_logger.c @@ -37,7 +37,7 @@ #include #include -#include +#include #include #define ERROR_LEVEL 0 diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 73390fa1476..f557ad1ff5f 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -50,7 +51,6 @@ #include #include -#include #include #include diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h index f45354d2930..95379448b57 100644 --- a/sys/dev/ixl/ixl.h +++ b/sys/dev/ixl/ixl.h @@ -89,6 +89,7 @@ #include #include #include +#include #include #include #include @@ -96,7 +97,6 @@ #include #include #include -#include #ifdef RSS #include diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index 96dc975ed36..77e25339a1a 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -58,13 +58,12 @@ #include #include #include +#include #include #include #include -#include - #include #include #include diff --git a/sys/dev/mpr/mpr_sas.c b/sys/dev/mpr/mpr_sas.c index 048b3cb7a53..5f3a27a468b 100644 --- a/sys/dev/mpr/mpr_sas.c +++ b/sys/dev/mpr/mpr_sas.c @@ -51,13 +51,12 @@ #include #include #include +#include #include #include #include -#include - #include #include #include diff --git a/sys/dev/mpr/mpr_sas_lsi.c b/sys/dev/mpr/mpr_sas_lsi.c index 766473370dc..d9744b1054c 100644 --- a/sys/dev/mpr/mpr_sas_lsi.c +++ b/sys/dev/mpr/mpr_sas_lsi.c @@ -51,13 +51,12 @@ #include #include #include +#include #include #include #include -#include - #include #include #include diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c index 3cf29aa4e89..d69c8ea5fde 100644 --- a/sys/dev/mps/mps_sas.c +++ b/sys/dev/mps/mps_sas.c @@ -51,13 +51,12 @@ #include #include #include +#include #include #include #include -#include - #include #include #include diff --git a/sys/dev/mps/mps_sas_lsi.c b/sys/dev/mps/mps_sas_lsi.c index aeec50433e0..e2d1ef2b013 100644 --- a/sys/dev/mps/mps_sas_lsi.c +++ b/sys/dev/mps/mps_sas_lsi.c @@ -52,13 +52,12 @@ #include #include #include +#include #include #include #include -#include - #include #include #include diff --git a/sys/dev/mpt/mpt_debug.c b/sys/dev/mpt/mpt_debug.c index 8e8cb0cf413..f2441c78c66 100644 --- a/sys/dev/mpt/mpt_debug.c +++ b/sys/dev/mpt/mpt_debug.c @@ -75,7 +75,7 @@ #include -#include /* for use by mpt_prt below */ +#include /* for use by mpt_prt below */ struct Error_Map { int Error_Code; diff --git a/sys/dev/mpt/mpt_raid.c b/sys/dev/mpt/mpt_raid.c index d4761c0fef6..5ff08ffcf2b 100644 --- a/sys/dev/mpt/mpt_raid.c +++ b/sys/dev/mpt/mpt_raid.c @@ -57,10 +57,9 @@ #include #include +#include #include -#include - struct mpt_raid_action_result { union { diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c index 9677d16f088..4132af157a6 100644 --- a/sys/dev/mvs/mvs.c +++ b/sys/dev/mvs/mvs.c @@ -37,8 +37,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/sys/dev/mvs/mvs_pci.c b/sys/dev/mvs/mvs_pci.c index 9dfb5e3bbed..f0df709db73 100644 --- a/sys/dev/mvs/mvs_pci.c +++ b/sys/dev/mvs/mvs_pci.c @@ -36,8 +36,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c index bc53e2d5b24..5bafc07847b 100644 --- a/sys/dev/mvs/mvs_soc.c +++ b/sys/dev/mvs/mvs_soc.c @@ -35,8 +35,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index e82e468775d..73a7cee4aad 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include "nvme_private.h" diff --git a/sys/dev/nvmf/host/nvmf_ns.c b/sys/dev/nvmf/host/nvmf_ns.c index 87cb4fa6800..4215c8295d2 100644 --- a/sys/dev/nvmf/host/nvmf_ns.c +++ b/sys/dev/nvmf/host/nvmf_ns.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/dev/ocs_fc/ocs_os.h b/sys/dev/ocs_fc/ocs_os.h index 9e3beff3554..331d5b07aec 100644 --- a/sys/dev/ocs_fc/ocs_os.h +++ b/sys/dev/ocs_fc/ocs_os.h @@ -56,10 +56,10 @@ #include #include #include +#include #include #include -#include #include diff --git a/sys/dev/ofw/ofw_fdt.c b/sys/dev/ofw/ofw_fdt.c index 4b0451824df..fd9a9f80af3 100644 --- a/sys/dev/ofw/ofw_fdt.c +++ b/sys/dev/ofw/ofw_fdt.c @@ -32,12 +32,11 @@ #include #include #include +#include #include #include -#include - #include #include #include diff --git a/sys/dev/ofw/ofw_standard.c b/sys/dev/ofw/ofw_standard.c index 47a2cabf44a..8df768dffbc 100644 --- a/sys/dev/ofw/ofw_standard.c +++ b/sys/dev/ofw/ofw_standard.c @@ -60,10 +60,9 @@ #include #include #include +#include #include -#include - #include #include diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c index 22e8d470e6c..b5f58b86a9c 100644 --- a/sys/dev/ofw/openfirm.c +++ b/sys/dev/ofw/openfirm.c @@ -68,8 +68,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index b923133c4b6..27355c33591 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -58,7 +59,6 @@ #include #include #include -#include #if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) #include diff --git a/sys/dev/pci/pci_iov.c b/sys/dev/pci/pci_iov.c index e65006c436f..1f72391fb6b 100644 --- a/sys/dev/pci/pci_iov.c +++ b/sys/dev/pci/pci_iov.c @@ -43,10 +43,10 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/dev/pci/pci_iov_schema.c b/sys/dev/pci/pci_iov_schema.c index 804a8b1c0a8..f60c687f9b8 100644 --- a/sys/dev/pci/pci_iov_schema.c +++ b/sys/dev/pci/pci_iov_schema.c @@ -33,8 +33,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c index 1e2cb17640a..d43f3037417 100644 --- a/sys/dev/ppbus/ppb_msq.c +++ b/sys/dev/ppbus/ppb_msq.c @@ -29,7 +29,7 @@ */ #include -#include +#include #include #include diff --git a/sys/dev/proto/proto_core.c b/sys/dev/proto/proto_core.c index 2a7fe3bf9f3..88963f9154b 100644 --- a/sys/dev/proto/proto_core.c +++ b/sys/dev/proto/proto_core.c @@ -38,11 +38,11 @@ #include #include #include +#include #include #include #include #include -#include #include diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c index 353d4180880..2afb989e859 100644 --- a/sys/dev/pst/pst-iop.c +++ b/sys/dev/pst/pst-iop.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/pst/pst-pci.c b/sys/dev/pst/pst-pci.c index 54eeb5c755c..3c1f740cf2f 100644 --- a/sys/dev/pst/pst-pci.c +++ b/sys/dev/pst/pst-pci.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c index f1d66f7598e..3e98ed9eb1d 100644 --- a/sys/dev/pst/pst-raid.c +++ b/sys/dev/pst/pst-raid.c @@ -41,11 +41,11 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c index c3b56157078..27cfde01c7a 100644 --- a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c +++ b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/dev/random/fenestrasX/fx_rng.c b/sys/dev/random/fenestrasX/fx_rng.c index eb6c19b9179..5faaea1cca3 100644 --- a/sys/dev/random/fenestrasX/fx_rng.c +++ b/sys/dev/random/fenestrasX/fx_rng.c @@ -34,11 +34,11 @@ #include #include #include +#include #include #include #include -#include #define CHACHA_EMBED #define KEYSTREAM_ONLY diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c index 47dd418aa2d..6a4a08a5c72 100644 --- a/sys/dev/rndtest/rndtest.c +++ b/sys/dev/rndtest/rndtest.c @@ -41,8 +41,8 @@ #include #include #include +#include #include -#include #include diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c index 2f79d3099f4..b53b85bf44c 100644 --- a/sys/dev/sdhci/sdhci.c +++ b/sys/dev/sdhci/sdhci.c @@ -40,13 +40,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c index df11b36ec84..eb6848eddee 100644 --- a/sys/dev/siis/siis.c +++ b/sys/dev/siis/siis.c @@ -38,9 +38,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/superio/superio.c b/sys/dev/superio/superio.c index 94e97f197a9..be852a3db36 100644 --- a/sys/dev/superio/superio.c +++ b/sys/dev/superio/superio.c @@ -37,11 +37,11 @@ #include #include #include +#include #include #include #include -#include #include diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index fd204491f8f..84c52659bfb 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -72,7 +73,6 @@ #include #include #endif -#include #if defined(__amd64__) || defined(__i386__) #include diff --git a/sys/dev/uart/uart_core.c b/sys/dev/uart/uart_core.c index e608d6c95ea..0ee43f6d2d9 100644 --- a/sys/dev/uart/uart_core.c +++ b/sys/dev/uart/uart_core.c @@ -38,11 +38,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c index faae077916f..d15d1d0c6ac 100644 --- a/sys/dev/uart/uart_tty.c +++ b/sys/dev/uart/uart_tty.c @@ -36,11 +36,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c index a736a12fc4f..293b0c72587 100644 --- a/sys/dev/usb/usb_dev.c +++ b/sys/dev/usb/usb_dev.c @@ -80,8 +80,7 @@ #include #include #include - -#include +#include #endif /* USB_GLOBAL_INCLUDE_FILE */ #if USB_HAVE_UGEN diff --git a/sys/dev/virtio/scsi/virtio_scsi.c b/sys/dev/virtio/scsi/virtio_scsi.c index 68da81a9785..857da56ba42 100644 --- a/sys/dev/virtio/scsi/virtio_scsi.c +++ b/sys/dev/virtio/scsi/virtio_scsi.c @@ -41,8 +41,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/dev/xen/bus/xen_intr.c b/sys/dev/xen/bus/xen_intr.c index bfe080b16f0..cb30b6efa48 100644 --- a/sys/dev/xen/bus/xen_intr.c +++ b/sys/dev/xen/bus/xen_intr.c @@ -45,12 +45,12 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/dev/xen/console/xen_console.c b/sys/dev/xen/console/xen_console.c index f1a298a2aef..1d12d6caa25 100644 --- a/sys/dev/xen/console/xen_console.c +++ b/sys/dev/xen/console/xen_console.c @@ -42,8 +42,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c index 9fc0a4102f6..f4cbd927bd6 100644 --- a/sys/dev/xen/xenpci/xenpci.c +++ b/sys/dev/xen/xenpci/xenpci.c @@ -31,13 +31,12 @@ #include #include #include +#include #include #include #include -#include - #include #include #include diff --git a/sys/dev/xen/xenstore/xenstore.c b/sys/dev/xen/xenstore/xenstore.c index 2cccc00ca5a..e5187466f1f 100644 --- a/sys/dev/xen/xenstore/xenstore.c +++ b/sys/dev/xen/xenstore/xenstore.c @@ -45,10 +45,9 @@ #include #include #include +#include #include -#include - #include #include #include diff --git a/sys/fs/nfsclient/nfs_clsubs.c b/sys/fs/nfsclient/nfs_clsubs.c index 8bb51e29e1d..ae9fa51947c 100644 --- a/sys/fs/nfsclient/nfs_clsubs.c +++ b/sys/fs/nfsclient/nfs_clsubs.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -71,12 +72,6 @@ #include -/* - * Note that stdarg.h and the ANSI style va_start macro is used for both - * ANSI and traditional C compilers. - */ -#include - extern struct mtx ncl_iod_mutex; extern enum nfsiod_state ncl_iodwant[NFS_MAXASYNCDAEMON]; extern struct nfsmount *ncl_iodmount[NFS_MAXASYNCDAEMON]; diff --git a/sys/fs/p9fs/p9_client.h b/sys/fs/p9fs/p9_client.h index 79d402c174e..4eb82c0232f 100644 --- a/sys/fs/p9fs/p9_client.h +++ b/sys/fs/p9fs/p9_client.h @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c index 5536bd6b711..9e9c5e25d2d 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -50,8 +51,6 @@ #define GCTL_TABLE 1 #include -#include - static d_ioctl_t g_ctl_ioctl; static struct cdevsw g_ctl_cdevsw = { diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index d340beb79bd..4a2a850c2ea 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -52,10 +52,10 @@ #include #include #include +#include #include #include #include -#include struct g_dev_softc { struct mtx sc_mtx; diff --git a/sys/geom/geom_dump.c b/sys/geom/geom_dump.c index 5de09e51295..fa2525eb6db 100644 --- a/sys/geom/geom_dump.c +++ b/sys/geom/geom_dump.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c index ad9231905f7..0a76fd6c6f5 100644 --- a/sys/geom/geom_event.c +++ b/sys/geom/geom_event.c @@ -48,12 +48,11 @@ #include #include #include +#include #include #include #include -#include - TAILQ_HEAD(event_tailq_head, g_event); static struct event_tailq_head g_events = TAILQ_HEAD_INITIALIZER(g_events); diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c index 02c8ed9f2ba..8d6b9a926e1 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -48,10 +48,10 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c index 0839bc21381..8cfffc47884 100644 --- a/sys/geom/geom_slice.c +++ b/sys/geom/geom_slice.c @@ -45,9 +45,9 @@ #include #include #include +#include #include #include -#include static g_access_t g_slice_access; static g_start_t g_slice_start; diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index 4e2c122ef6d..41cc115225f 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -51,10 +51,10 @@ #include #include #include +#include #include #include #include -#include #ifdef DDB #include diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c index 7f3e1546f23..59d2799f26b 100644 --- a/sys/i386/i386/bios.c +++ b/sys/i386/i386/bios.c @@ -41,11 +41,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #ifdef DEV_ISA diff --git a/sys/i386/linux/linux_vdso_gtod.c b/sys/i386/linux/linux_vdso_gtod.c index ca200ce04da..00367d82139 100644 --- a/sys/i386/linux/linux_vdso_gtod.c +++ b/sys/i386/linux/linux_vdso_gtod.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #define _KERNEL #include @@ -36,7 +37,6 @@ #include #include -#include #include #include diff --git a/sys/isa/pnpparse.c b/sys/isa/pnpparse.c index b26c8c45c4c..49e252120ce 100644 --- a/sys/isa/pnpparse.c +++ b/sys/isa/pnpparse.c @@ -31,8 +31,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/kern/kern_boottrace.c b/sys/kern/kern_boottrace.c index 5516f316058..1fa87955a29 100644 --- a/sys/kern/kern_boottrace.c +++ b/sys/kern/kern_boottrace.c @@ -33,12 +33,11 @@ #include #include #include +#include #include #include #include -#include - #define dprintf(fmt, ...) \ do { \ if (dotrace_debugging) \ diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index 1f0772e9703..b891ed84957 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -41,9 +41,9 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/kern/kern_devctl.c b/sys/kern/kern_devctl.c index d83bc380c2f..7a2818c29b1 100644 --- a/sys/kern/kern_devctl.c +++ b/sys/kern/kern_devctl.c @@ -46,13 +46,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/sys/kern/kern_fail.c b/sys/kern/kern_fail.c index 258268bb874..11871dfb0dc 100644 --- a/sys/kern/kern_fail.c +++ b/sys/kern/kern_fail.c @@ -66,12 +66,12 @@ #include #include #include +#include #include #include #include #include -#include #ifdef ILOG_DEFINE_FOR_FILE ILOG_DEFINE_FOR_FILE(L_ISI_FAIL_POINT, L_ILOG, fail_point); diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 4ef37ac829b..1280c2d8527 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -60,7 +61,6 @@ #include #include #include -#include #ifdef DDB #include #include diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 97d10fdb394..cfe2dab2e05 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -42,12 +42,11 @@ #include #include #include +#include #include #include #include -#include - /* * Start a kernel process. This is called after a fork() call in * mi_startup() in the file kern/init_main.c. diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index afeb320405d..38a980106e6 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -71,6 +71,7 @@ #include #include #include +#include #include #include #include @@ -112,12 +113,6 @@ SYSCTL_INT(_kern, OID_AUTO, reboot_wait_time, CTLFLAG_RWTUN, &reboot_wait_time, 0, "Seconds to wait before rebooting"); -/* - * Note that stdarg.h and the ANSI style va_start macro is used for both - * ANSI and traditional C compilers. - */ -#include - #ifdef KDB #ifdef KDB_UNATTENDED int debugger_on_panic = 0; diff --git a/sys/kern/kern_ubsan.c b/sys/kern/kern_ubsan.c index 80328fb0899..e957d5ebda2 100644 --- a/sys/kern/kern_ubsan.c +++ b/sys/kern/kern_ubsan.c @@ -49,9 +49,9 @@ __RCSID("$NetBSD: ubsan.c,v 1.3 2018/08/03 16:31:04 kamil Exp $"); #include #include #include +#include #include #include -#include #define ASSERT(x) KASSERT(x, ("%s: " __STRING(x) " failed", __func__)) #define __arraycount(x) nitems(x) #define ISSET(x, y) ((x) & (y)) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 1cbb91634d4..4de1df0c248 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -61,7 +62,6 @@ #include #include -#include #include #include diff --git a/sys/kern/subr_capability.c b/sys/kern/subr_capability.c index a6175a2944a..7cc6fb59369 100644 --- a/sys/kern/subr_capability.c +++ b/sys/kern/subr_capability.c @@ -39,7 +39,7 @@ #ifdef _KERNEL #include #include -#include +#include #else /* !_KERNEL */ #include #include diff --git a/sys/kern/subr_epoch.c b/sys/kern/subr_epoch.c index 76672279a34..51d66d51db8 100644 --- a/sys/kern/subr_epoch.c +++ b/sys/kern/subr_epoch.c @@ -44,7 +44,7 @@ #include #include #ifdef EPOCH_TRACE -#include +#include #include #include #endif diff --git a/sys/kern/subr_gtaskqueue.c b/sys/kern/subr_gtaskqueue.c index 120ffaba874..e13721ffe1f 100644 --- a/sys/kern/subr_gtaskqueue.c +++ b/sys/kern/subr_gtaskqueue.c @@ -41,9 +41,9 @@ #include #include #include +#include #include #include -#include static MALLOC_DEFINE(M_GTASKQUEUE, "gtaskqueue", "Group Task Queues"); static void gtaskqueue_thread_enqueue(void *); diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index dec40aa04e4..3de753a5192 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -74,7 +75,6 @@ #include #include #include -#include #ifdef DDB #include diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 0c4e589ec1e..a3238b61482 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.14 2020/09/09 16:29:59 maxv Exp $"); #include #include #include +#include #include #include @@ -60,7 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.14 2020/09/09 16:29:59 maxv Exp $"); #include #include -#include void kmsan_init_arg(size_t); void kmsan_init_ret(size_t); diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 131d5456d2f..db0ceb17b9f 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -69,12 +69,8 @@ #include #endif -/* - * Note that stdarg.h and the ANSI style va_start macro is used for both - * ANSI and traditional C compilers. - */ #ifdef _KERNEL -#include +#include #else #include #endif diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c index 9b63d72c19d..27e18c114af 100644 --- a/sys/kern/subr_sbuf.c +++ b/sys/kern/subr_sbuf.c @@ -36,9 +36,9 @@ #include #include #include +#include #include #include -#include #else /* _KERNEL */ #include #include diff --git a/sys/kern/subr_scanf.c b/sys/kern/subr_scanf.c index 907318fe1d8..88a0555ea60 100644 --- a/sys/kern/subr_scanf.c +++ b/sys/kern/subr_scanf.c @@ -38,14 +38,9 @@ #include #include #include +#include #include -/* - * Note that stdarg.h and the ANSI style va_start macro is used for both - * ANSI and traditional C compilers. - */ -#include - #define BUF 32 /* Maximum length of numeric string. */ /* diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c index c4146922edc..f17e59a441a 100644 --- a/sys/kern/subr_taskqueue.c +++ b/sys/kern/subr_taskqueue.c @@ -42,9 +42,9 @@ #include #include #include +#include #include #include -#include static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues"); static void *taskqueue_giant_ih; diff --git a/sys/kern/subr_terminal.c b/sys/kern/subr_terminal.c index e34ef7087ad..4de52c2ef65 100644 --- a/sys/kern/subr_terminal.c +++ b/sys/kern/subr_terminal.c @@ -35,12 +35,11 @@ #include #include #include +#include #include #include #include -#include - static MALLOC_DEFINE(M_TERMINAL, "terminal", "terminal device"); /* diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index aa189e8cd05..ab47b6ad29a 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -105,6 +105,7 @@ #include #include #include +#include #include #include #include @@ -113,8 +114,6 @@ #include #endif -#include - #if !defined(DDB) && !defined(STACK) #error "DDB or STACK options are required for WITNESS" #endif diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 47f9f25cec3..c8e2c561b7c 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -68,8 +69,6 @@ #include -#include - static MALLOC_DEFINE(M_TTY, "tty", "tty device"); static void tty_rel_free(struct tty *tp); diff --git a/sys/kern/tty_pts.c b/sys/kern/tty_pts.c index d629fa0e759..1291770a9cc 100644 --- a/sys/kern/tty_pts.c +++ b/sys/kern/tty_pts.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -65,8 +66,6 @@ #include #include -#include - /* * Our utmp(5) format is limited to 8-byte TTY line names. This means * we can at most allocate 1000 pseudo-terminals ("pts/999"). Allow diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index a09a3049d79..cb18468d28b 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -67,8 +68,6 @@ #include -#include - #include #include diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 0464df2f5ad..dc2fb59fb81 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -77,6 +77,7 @@ #include #include #include +#include #include #include #include @@ -84,8 +85,6 @@ #include #include -#include - #include #include diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index ac906c6286f..b3afad55f65 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -66,6 +66,7 @@ #include #include #include +#incluee #include #include #include @@ -73,8 +74,6 @@ #include #include -#include - #include #include diff --git a/sys/libkern/asprintf.c b/sys/libkern/asprintf.c index a69ceb5b373..fa235615856 100644 --- a/sys/libkern/asprintf.c +++ b/sys/libkern/asprintf.c @@ -27,8 +27,7 @@ #include #include #include - -#include +#include int vasprintf(char **buf, struct malloc_type *mtp, const char *format, va_list va) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index ba397e9e5d3..9ebdd11f70f 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -42,8 +42,8 @@ #include /* hz */ #include /* for net/if.h */ #include +#include #include -#include #include #include #include diff --git a/sys/net/if.c b/sys/net/if.c index 0255c27a313..2363c48a24d 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -70,7 +71,6 @@ #include #endif -#include #include #include diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index 6fa3d03d1cf..c6eea784e15 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -92,6 +92,7 @@ #include #include #include +#include #include #include @@ -123,8 +124,6 @@ #include -#include - #include #include diff --git a/sys/net/route/fib_algo.c b/sys/net/route/fib_algo.c index 25370f18934..ca635ad8a7b 100644 --- a/sys/net/route/fib_algo.c +++ b/sys/net/route/fib_algo.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -67,8 +68,6 @@ #include #include -#include - /* * Fib lookup framework. * diff --git a/sys/net/vnet.c b/sys/net/vnet.c index c64aaf9f61b..a2b827052dd 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -54,8 +55,6 @@ #include #include -#include - #ifdef DDB #include #include diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 65ecb5d7760..2b7cf635b9f 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -38,8 +38,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index b5ab79a4ad1..e01d0bf20f5 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -59,8 +60,6 @@ #include #include -#include - #include #include diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 69ec286305b..a5f2abd747d 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -937,7 +937,7 @@ ieee80211_getbssid(const struct ieee80211vap *vap, return wh->i_addr3; } -#include +#include void ieee80211_note(const struct ieee80211vap *vap, const char *fmt, ...) diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c index 1a1d9d8b306..448ecc92f07 100644 --- a/sys/netgraph/ng_parse.c +++ b/sys/netgraph/ng_parse.c @@ -49,8 +49,7 @@ #include #include #include - -#include +#include #include diff --git a/sys/netinet/libalias/alias_db.c b/sys/netinet/libalias/alias_db.c index 732adb8afa8..c143d74a2f4 100644 --- a/sys/netinet/libalias/alias_db.c +++ b/sys/netinet/libalias/alias_db.c @@ -28,13 +28,13 @@ #include #ifdef _KERNEL -#include #include #include #include #include #include #include +#include #include #else #include diff --git a/sys/netinet/libalias/alias_sctp.c b/sys/netinet/libalias/alias_sctp.c index 6781c33f5ed..5ccf31697b4 100644 --- a/sys/netinet/libalias/alias_sctp.c +++ b/sys/netinet/libalias/alias_sctp.c @@ -72,12 +72,12 @@ #ifdef _KERNEL -#include #include #include #include #include #include +#include #include #include #include diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 7b6104da540..66070faf97e 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -74,7 +75,6 @@ #include -#include #include extern ipproto_input_t *ip_protox[]; diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 1bb0c0e835c..0379ef7c789 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -76,6 +76,7 @@ #include #include #include +#include #include #include @@ -105,8 +106,6 @@ #include -#include - #define satosin6(sa) ((struct sockaddr_in6 *)(sa)) #define ifatoia6(ifa) ((struct in6_ifaddr *)(ifa)) diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c index dbb20748cf4..221ac879cb1 100644 --- a/sys/netipsec/ipsec_input.c +++ b/sys/netipsec/ipsec_input.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -99,7 +100,6 @@ #include #include -#include #define IPSEC_ISTAT(proto, name) do { \ if ((proto) == IPPROTO_ESP) \ diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c index d57ac382601..467d5ded1d7 100644 --- a/sys/netipsec/ipsec_offload.c +++ b/sys/netipsec/ipsec_offload.c @@ -38,10 +38,9 @@ #include #include #include +#include #include -#include - #include #include #include diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index d6b49215156..ae67d83c6d1 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -93,7 +94,6 @@ #include #include #include -#include /* randomness */ #include diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index d9297d44c18..23c155ed6af 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -63,8 +64,6 @@ #include #include -#include - static struct mtx keysock_mtx; MTX_SYSINIT(keysock, &keysock_mtx, "key socket pcb list", MTX_DEF); diff --git a/sys/netlink/netlink_message_parser.c b/sys/netlink/netlink_message_parser.c index caef40ff73b..4c41235efaa 100644 --- a/sys/netlink/netlink_message_parser.c +++ b/sys/netlink/netlink_message_parser.c @@ -32,8 +32,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/powerpc/mpc85xx/mpc85xx_gpio.c b/sys/powerpc/mpc85xx/mpc85xx_gpio.c index 22c35261f7b..0f333feb747 100644 --- a/sys/powerpc/mpc85xx/mpc85xx_gpio.c +++ b/sys/powerpc/mpc85xx/mpc85xx_gpio.c @@ -36,10 +36,10 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/powerpc/ofw/ofw_real.c b/sys/powerpc/ofw/ofw_real.c index 1d29dd4f4c8..5ca21af4938 100644 --- a/sys/powerpc/ofw/ofw_real.c +++ b/sys/powerpc/ofw/ofw_real.c @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -72,7 +73,6 @@ #include #include #include -#include #include #include diff --git a/sys/powerpc/ofw/rtas.c b/sys/powerpc/ofw/rtas.c index a82d42511a6..c27598d8b94 100644 --- a/sys/powerpc/ofw/rtas.c +++ b/sys/powerpc/ofw/rtas.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -43,7 +44,6 @@ #include #include #include -#include #include diff --git a/sys/powerpc/powermac/ata_dbdma.c b/sys/powerpc/powermac/ata_dbdma.c index ae5a35e6057..22fa04f0e2b 100644 --- a/sys/powerpc/powermac/ata_dbdma.c +++ b/sys/powerpc/powermac/ata_dbdma.c @@ -39,9 +39,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c index 1c1c85ef9b4..62404664a55 100644 --- a/sys/powerpc/powermac/ata_kauai.c +++ b/sys/powerpc/powermac/ata_kauai.c @@ -38,9 +38,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/powerpc/powermac/ata_macio.c b/sys/powerpc/powermac/ata_macio.c index 5363fb1c585..8360f4bcc0d 100644 --- a/sys/powerpc/powermac/ata_macio.c +++ b/sys/powerpc/powermac/ata_macio.c @@ -38,9 +38,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/powerpc/psim/ata_iobus.c b/sys/powerpc/psim/ata_iobus.c index 4ca9ecafc99..fff2cc65957 100644 --- a/sys/powerpc/psim/ata_iobus.c +++ b/sys/powerpc/psim/ata_iobus.c @@ -38,8 +38,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c b/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c index 9999a282593..e137351c471 100644 --- a/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c +++ b/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c @@ -321,7 +321,7 @@ xdr_rpc_gss_unwrap_data(struct mbuf **resultsp, } #ifdef DEBUG -#include +#include void rpc_gss_log_debug(const char *fmt, ...) diff --git a/sys/security/audit/audit_worker.c b/sys/security/audit/audit_worker.c index 6721cbab69b..c7e4b3217ee 100644 --- a/sys/security/audit/audit_worker.c +++ b/sys/security/audit/audit_worker.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -75,8 +76,6 @@ #include -#include - /* * Worker thread that will schedule disk I/O, etc. */ diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 9aeafa62b56..8856be5fa1a 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -24,13 +24,12 @@ #include #include #include +#include #include #include #include #include -#include - #include static SYSCTL_NODE(_security_mac, OID_AUTO, do, diff --git a/sys/tests/ktest.c b/sys/tests/ktest.c index 640710f2b89..f8eb03f0b6e 100644 --- a/sys/tests/ktest.c +++ b/sys/tests/ktest.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -41,7 +42,6 @@ #include #include -#include #include struct mtx ktest_mtx; diff --git a/sys/x86/x86/ucode.c b/sys/x86/x86/ucode.c index 923d9e31b44..0c153c0b656 100644 --- a/sys/x86/x86/ucode.c +++ b/sys/x86/x86/ucode.c @@ -35,12 +35,12 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/xen/xenbus/xenbus.c b/sys/xen/xenbus/xenbus.c index 1d73d3c526b..9230a196cf5 100644 --- a/sys/xen/xenbus/xenbus.c +++ b/sys/xen/xenbus/xenbus.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -54,8 +55,6 @@ #include #include -#include - MALLOC_DEFINE(M_XENBUS, "xenbus", "XenBus Support"); /*------------------------- Private Functions --------------------------------*/ diff --git a/sys/xen/xenbus/xenbusb.c b/sys/xen/xenbus/xenbusb.c index b64bc4a99bb..0d51e904121 100644 --- a/sys/xen/xenbus/xenbusb.c +++ b/sys/xen/xenbus/xenbusb.c @@ -59,14 +59,13 @@ #include #include #include +#include #include #include #include #include #include -#include - #include #include #include diff --git a/sys/xen/xenbus/xenbusb_back.c b/sys/xen/xenbus/xenbusb_back.c index 7b0d7bd0c0a..b7563b37600 100644 --- a/sys/xen/xenbus/xenbusb_back.c +++ b/sys/xen/xenbus/xenbusb_back.c @@ -43,14 +43,13 @@ #include #include #include +#include #include #include #include #include #include -#include - #include #include #include diff --git a/sys/xen/xenbus/xenbusb_front.c b/sys/xen/xenbus/xenbusb_front.c index 393d9ff87f2..34fb104e7d9 100644 --- a/sys/xen/xenbus/xenbusb_front.c +++ b/sys/xen/xenbus/xenbusb_front.c @@ -43,14 +43,13 @@ #include #include #include +#include #include #include #include #include #include -#include - #include #include #include diff --git a/sys/xen/xenbus/xenbusvar.h b/sys/xen/xenbus/xenbusvar.h index 2e3d95795c4..ee444c132c0 100644 --- a/sys/xen/xenbus/xenbusvar.h +++ b/sys/xen/xenbus/xenbusvar.h @@ -39,8 +39,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/xen/xenstore/xenstorevar.h b/sys/xen/xenstore/xenstorevar.h index 3b281ed21b0..8b02262396e 100644 --- a/sys/xen/xenstore/xenstorevar.h +++ b/sys/xen/xenstore/xenstorevar.h @@ -37,8 +37,7 @@ #include #include #include - -#include +#include #include #include diff --git a/tools/tools/vhba/vhba.h b/tools/tools/vhba/vhba.h index d6b32b10b56..be00779bcb5 100644 --- a/tools/tools/vhba/vhba.h +++ b/tools/tools/vhba/vhba.h @@ -38,12 +38,12 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/tools/uma/smrstress/smrstress.c b/tools/uma/smrstress/smrstress.c index 2d6566c6e6d..41fa11b4364 100644 --- a/tools/uma/smrstress/smrstress.c +++ b/tools/uma/smrstress/smrstress.c @@ -37,11 +37,10 @@ #include #include #include +#include #include -#include - static uma_zone_t smrs_zone; static smr_t smrs_smr;