git: e453e498cbb8 - main - machine/stdarg.h -> sys/stdarg.h
Date: Wed, 11 Jun 2025 17:00:27 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=e453e498cbb88570a3ff7b3679de65c88707da95
commit e453e498cbb88570a3ff7b3679de65c88707da95
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2025-06-11 16:39:02 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2025-06-11 16:39:02 +0000
machine/stdarg.h -> sys/stdarg.h
Switch to using sys/stdarg.h for va_list type and va_* builtins.
Make an attempt to insert the include in a sensible place. Where
style(9) was followed this is easy, where it was ignored, aim for the
first block of sys/*.h headers and don't get too fussy or try to fix
other style bugs.
Reviewed by: imp
Exp-run by: antoine (PR 286274)
Pull Request: https://github.com/freebsd/freebsd-src/pull/1595
---
share/man/man9/PCI_IOV_ADD_VF.9 | 2 +-
share/man/man9/PCI_IOV_INIT.9 | 2 +-
share/man/man9/pci_iov_schema.9 | 2 +-
stand/common/dev_net.c | 3 ++-
stand/common/md.c | 2 +-
stand/efi/boot1/boot1.c | 4 +++-
stand/efi/boot1/proto.c | 4 +++-
stand/efi/gptboot/proto.c | 4 +++-
stand/i386/libi386/biosacpi.c | 2 +-
stand/i386/libi386/biospci.c | 2 +-
stand/i386/libi386/biospnp.c | 2 +-
stand/liblua/lstd.h | 2 +-
stand/libofw/ofw_disk.c | 3 +--
stand/libofw/openfirm.c | 3 +--
stand/libsa/Makefile | 2 +-
stand/libsa/panic.c | 2 +-
stand/libsa/printf.c | 7 +------
stand/powerpc/boot1.chrp/boot1.c | 4 +++-
stand/uboot/uboot_disk.c | 3 ++-
sys/amd64/linux/linux_vdso_gtod.c | 2 +-
sys/amd64/linux32/linux32_vdso_gtod.c | 2 +-
sys/arm/ti/cpsw/if_cpsw.c | 2 +-
sys/arm/xilinx/zy7_devcfg.c | 2 +-
sys/arm/xilinx/zy7_ehci.c | 2 +-
sys/arm/xilinx/zy7_gpio.c | 2 +-
sys/arm/xilinx/zy7_qspi.c | 2 +-
sys/arm/xilinx/zy7_slcr.c | 2 +-
sys/arm/xilinx/zy7_spi.c | 2 +-
sys/arm64/linux/linux_vdso_gtod.c | 2 +-
sys/arm64/qoriq/qoriq_gpio_pic.c | 2 +-
sys/cam/ata/ata_xpt.c | 2 +-
sys/cam/cam_xpt.c | 2 +-
sys/cam/ctl/ctl_error.c | 2 +-
sys/cam/ctl/ctl_error.h | 2 +-
sys/cam/mmc/mmc_xpt.c | 2 +-
sys/cam/nvme/nvme_xpt.c | 2 +-
sys/cam/scsi/scsi_all.h | 2 +-
sys/cam/scsi/scsi_enc.c | 3 +--
sys/cam/scsi/scsi_xpt.c | 2 +-
sys/cddl/compat/opensolaris/kern/opensolaris_string.c | 2 +-
sys/cddl/compat/opensolaris/sys/cmn_err.h | 2 +-
sys/cddl/compat/opensolaris/sys/varargs.h | 2 +-
sys/cddl/dev/fbt/fbt.c | 2 +-
sys/cddl/dev/profile/profile.c | 2 +-
sys/cddl/dev/systrace/systrace.c | 3 +--
sys/compat/linux/linux_util.c | 3 +--
sys/compat/linuxkpi/common/include/linux/kmod.h | 2 +-
sys/compat/linuxkpi/common/include/linux/kobject.h | 2 +-
sys/compat/linuxkpi/common/include/linux/stdarg.h | 2 +-
sys/compat/linuxkpi/common/include/stdarg.h | 2 +-
sys/compat/linuxkpi/common/src/linux_compat.c | 3 +--
sys/compat/linuxkpi/common/src/linux_idr.c | 3 +--
sys/compat/linuxkpi/common/src/linux_pci.c | 2 +-
sys/contrib/dev/acpica/include/platform/acfreebsd.h | 2 +-
sys/contrib/libnv/bsd_nvpair.c | 3 +--
sys/contrib/libnv/cnvlist.c | 3 +--
sys/contrib/libnv/dnvlist.c | 3 +--
sys/contrib/libnv/nvlist.c | 3 +--
sys/contrib/ncsw/inc/stdarg_ext.h | 2 +-
sys/contrib/ncsw/user/env/xx.c | 2 +-
sys/contrib/openzfs/module/os/freebsd/spl/spl_string.c | 2 +-
sys/contrib/rdma/krping/krping_dev.c | 2 +-
sys/contrib/vchiq/interface/compat/vchi_bsd.c | 3 +--
sys/ddb/db_output.c | 3 +--
sys/ddb/db_pprint.c | 3 +--
sys/dev/aacraid/aacraid_debug.c | 3 +--
sys/dev/ahci/ahci.c | 2 +-
sys/dev/ahci/ahci_pci.c | 2 +-
sys/dev/ahci/ahciem.c | 2 +-
sys/dev/ata/ata-all.c | 2 +-
sys/dev/ata/ata-isa.c | 2 +-
sys/dev/ata/ata-pci.c | 5 ++++-
sys/dev/ata/ata-sata.c | 2 +-
sys/dev/ata/chipsets/ata-acard.c | 2 +-
sys/dev/ata/chipsets/ata-acerlabs.c | 2 +-
sys/dev/ata/chipsets/ata-amd.c | 2 +-
sys/dev/ata/chipsets/ata-ati.c | 2 +-
sys/dev/ata/chipsets/ata-cenatek.c | 2 +-
sys/dev/ata/chipsets/ata-cypress.c | 2 +-
sys/dev/ata/chipsets/ata-cyrix.c | 2 +-
sys/dev/ata/chipsets/ata-highpoint.c | 2 +-
sys/dev/ata/chipsets/ata-intel.c | 2 +-
sys/dev/ata/chipsets/ata-ite.c | 2 +-
sys/dev/ata/chipsets/ata-jmicron.c | 2 +-
sys/dev/ata/chipsets/ata-marvell.c | 2 +-
sys/dev/ata/chipsets/ata-micron.c | 2 +-
sys/dev/ata/chipsets/ata-national.c | 2 +-
sys/dev/ata/chipsets/ata-netcell.c | 2 +-
sys/dev/ata/chipsets/ata-nvidia.c | 2 +-
sys/dev/ata/chipsets/ata-promise.c | 2 +-
sys/dev/ata/chipsets/ata-serverworks.c | 2 +-
sys/dev/ata/chipsets/ata-siliconimage.c | 2 +-
sys/dev/ata/chipsets/ata-sis.c | 2 +-
sys/dev/ata/chipsets/ata-via.c | 2 +-
sys/dev/ath/ah_osdep.c | 3 +--
sys/dev/bhnd/nvram/bhnd_nvram_private.h | 3 +--
sys/dev/bhnd/nvram/bhnd_nvram_value.h | 2 +-
sys/dev/etherswitch/e6000sw/e6000sw.c | 2 +-
sys/dev/fdc/fdc.c | 2 +-
sys/dev/filemon/filemon_wrapper.c | 3 +--
sys/dev/gpio/qoriq_gpio.c | 2 +-
sys/dev/hpt27xx/os_bsd.h | 2 +-
sys/dev/hptiop/hptiop.c | 2 +-
sys/dev/hptmv/hptproc.c | 2 +-
sys/dev/hptnr/os_bsd.h | 2 +-
sys/dev/hptrr/os_bsd.h | 2 +-
sys/dev/hyperv/vmbus/vmbus_chan.c | 2 +-
sys/dev/iavf/iavf_iflib.h | 2 +-
sys/dev/iavf/iavf_lib.h | 2 +-
sys/dev/iavf/iavf_osdep.c | 2 +-
sys/dev/ice/ice_osdep.c | 2 +-
sys/dev/iicbus/controller/cadence/cdnc_i2c.c | 2 +-
sys/dev/ioat/ioat.c | 2 +-
sys/dev/ioat/ioat_test.c | 2 +-
sys/dev/isci/isci_logger.c | 2 +-
sys/dev/isp/isp_freebsd.h | 2 +-
sys/dev/ixl/ixl.h | 2 +-
sys/dev/mpi3mr/mpi3mr_cam.c | 3 +--
sys/dev/mpr/mpr_sas.c | 3 +--
sys/dev/mpr/mpr_sas_lsi.c | 3 +--
sys/dev/mps/mps_sas.c | 3 +--
sys/dev/mps/mps_sas_lsi.c | 3 +--
sys/dev/mpt/mpt_debug.c | 2 +-
sys/dev/mpt/mpt_raid.c | 3 +--
sys/dev/mvs/mvs.c | 2 +-
sys/dev/mvs/mvs_pci.c | 2 +-
sys/dev/mvs/mvs_soc.c | 2 +-
sys/dev/nvme/nvme_ctrlr.c | 2 +-
sys/dev/nvmf/host/nvmf_ns.c | 2 +-
sys/dev/ocs_fc/ocs_os.h | 2 +-
sys/dev/ofw/ofw_fdt.c | 3 +--
sys/dev/ofw/ofw_standard.c | 3 +--
sys/dev/ofw/openfirm.c | 3 +--
sys/dev/pci/pci.c | 2 +-
sys/dev/pci/pci_iov.c | 2 +-
sys/dev/pci/pci_iov_schema.c | 3 +--
sys/dev/ppbus/ppb_msq.c | 2 +-
sys/dev/proto/proto_core.c | 2 +-
sys/dev/pst/pst-iop.c | 2 +-
sys/dev/pst/pst-pci.c | 2 +-
sys/dev/pst/pst-raid.c | 2 +-
sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c | 2 +-
sys/dev/random/fenestrasX/fx_rng.c | 2 +-
sys/dev/rndtest/rndtest.c | 2 +-
sys/dev/sdhci/sdhci.c | 2 +-
sys/dev/siis/siis.c | 2 +-
sys/dev/superio/superio.c | 2 +-
sys/dev/syscons/syscons.c | 2 +-
sys/dev/uart/uart_core.c | 2 +-
sys/dev/uart/uart_tty.c | 2 +-
sys/dev/usb/usb_dev.c | 3 +--
sys/dev/virtio/scsi/virtio_scsi.c | 3 +--
sys/dev/xen/bus/xen_intr.c | 2 +-
sys/dev/xen/console/xen_console.c | 3 +--
sys/dev/xen/xenpci/xenpci.c | 3 +--
sys/dev/xen/xenstore/xenstore.c | 3 +--
sys/fs/nfsclient/nfs_clsubs.c | 7 +------
sys/fs/p9fs/p9_client.h | 2 +-
sys/geom/geom_ctl.c | 3 +--
sys/geom/geom_dev.c | 2 +-
sys/geom/geom_dump.c | 2 +-
sys/geom/geom_event.c | 3 +--
sys/geom/geom_io.c | 2 +-
sys/geom/geom_slice.c | 2 +-
sys/geom/geom_subr.c | 2 +-
sys/i386/i386/bios.c | 2 +-
sys/i386/linux/linux_vdso_gtod.c | 2 +-
sys/isa/pnpparse.c | 3 +--
sys/kern/kern_boottrace.c | 3 +--
sys/kern/kern_conf.c | 2 +-
sys/kern/kern_devctl.c | 2 +-
sys/kern/kern_fail.c | 2 +-
sys/kern/kern_intr.c | 2 +-
sys/kern/kern_kthread.c | 3 +--
sys/kern/kern_shutdown.c | 7 +------
sys/kern/kern_ubsan.c | 2 +-
sys/kern/subr_bus.c | 2 +-
sys/kern/subr_capability.c | 2 +-
sys/kern/subr_epoch.c | 2 +-
sys/kern/subr_gtaskqueue.c | 2 +-
sys/kern/subr_intr.c | 2 +-
sys/kern/subr_msan.c | 2 +-
sys/kern/subr_prf.c | 6 +-----
sys/kern/subr_sbuf.c | 2 +-
sys/kern/subr_scanf.c | 7 +------
sys/kern/subr_taskqueue.c | 2 +-
sys/kern/subr_terminal.c | 3 +--
sys/kern/subr_witness.c | 3 +--
sys/kern/tty.c | 3 +--
sys/kern/tty_pts.c | 3 +--
sys/kern/vfs_mount.c | 3 +--
sys/kern/vfs_subr.c | 3 +--
sys/kern/vfs_syscalls.c | 3 +--
sys/libkern/asprintf.c | 3 +--
sys/net/ieee8023ad_lacp.c | 2 +-
sys/net/if.c | 2 +-
sys/net/if_stf.c | 3 +--
sys/net/route/fib_algo.c | 3 +--
sys/net/vnet.c | 3 +--
sys/net80211/ieee80211.c | 3 +--
sys/net80211/ieee80211_freebsd.c | 3 +--
sys/net80211/ieee80211_input.c | 2 +-
sys/netgraph/ng_parse.c | 3 +--
sys/netinet/libalias/alias_db.c | 2 +-
sys/netinet/libalias/alias_sctp.c | 2 +-
sys/netinet/raw_ip.c | 2 +-
sys/netinet6/raw_ip6.c | 3 +--
sys/netipsec/ipsec_input.c | 2 +-
sys/netipsec/ipsec_offload.c | 3 +--
sys/netipsec/key.c | 2 +-
sys/netipsec/keysock.c | 3 +--
sys/netlink/netlink_message_parser.c | 3 +--
sys/powerpc/mpc85xx/mpc85xx_gpio.c | 2 +-
sys/powerpc/ofw/ofw_real.c | 2 +-
sys/powerpc/ofw/rtas.c | 2 +-
sys/powerpc/powermac/ata_dbdma.c | 2 +-
sys/powerpc/powermac/ata_kauai.c | 2 +-
sys/powerpc/powermac/ata_macio.c | 2 +-
sys/powerpc/psim/ata_iobus.c | 2 +-
sys/rpc/rpcsec_gss/rpcsec_gss_prot.c | 2 +-
sys/security/audit/audit_worker.c | 3 +--
sys/security/mac_do/mac_do.c | 3 +--
sys/tests/ktest.c | 2 +-
sys/x86/x86/ucode.c | 2 +-
sys/xen/xenbus/xenbus.c | 3 +--
sys/xen/xenbus/xenbusb.c | 3 +--
sys/xen/xenbus/xenbusb_back.c | 3 +--
sys/xen/xenbus/xenbusb_front.c | 3 +--
sys/xen/xenbus/xenbusvar.h | 3 +--
sys/xen/xenstore/xenstorevar.h | 3 +--
tools/tools/vhba/vhba.h | 2 +-
tools/uma/smrstress/smrstress.c | 3 +--
232 files changed, 245 insertions(+), 321 deletions(-)
diff --git a/share/man/man9/PCI_IOV_ADD_VF.9 b/share/man/man9/PCI_IOV_ADD_VF.9
index d13cb6e1ddc9..512b0b8668cc 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 66b1e693cedb..8ce94800f6d1 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 764d357fbaee..99589b59fb91 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 3cd78c5346ac..fc6b43ec7a40 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 <machine/stdarg.h>
#include <sys/param.h>
#include <sys/socket.h>
+#include <sys/stdarg.h>
+
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
diff --git a/stand/common/md.c b/stand/common/md.c
index d12429c3c45c..2c3eb5ded19b 100644
--- a/stand/common/md.c
+++ b/stand/common/md.c
@@ -28,7 +28,7 @@
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/queue.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
#include "bootstrap.h"
diff --git a/stand/efi/boot1/boot1.c b/stand/efi/boot1/boot1.c
index 908baf400972..b93c6b425160 100644
--- a/stand/efi/boot1/boot1.c
+++ b/stand/efi/boot1/boot1.c
@@ -20,8 +20,10 @@
*/
#include <sys/param.h>
+#include <sys/stdarg.h>
+
#include <machine/elf.h>
-#include <machine/stdarg.h>
+
#include <stand.h>
#include <efi.h>
diff --git a/stand/efi/boot1/proto.c b/stand/efi/boot1/proto.c
index 6660d39a921b..f81debd168b9 100644
--- a/stand/efi/boot1/proto.c
+++ b/stand/efi/boot1/proto.c
@@ -20,8 +20,10 @@
*/
#include <sys/param.h>
+#include <sys/stdarg.h>
+
#include <machine/elf.h>
-#include <machine/stdarg.h>
+
#include <stand.h>
#include <efi.h>
diff --git a/stand/efi/gptboot/proto.c b/stand/efi/gptboot/proto.c
index e2face6c23e5..a1825d9c1c15 100644
--- a/stand/efi/gptboot/proto.c
+++ b/stand/efi/gptboot/proto.c
@@ -24,8 +24,10 @@
*/
#include <sys/param.h>
+#include <sys/stdarg.h>
+
#include <machine/elf.h>
-#include <machine/stdarg.h>
+
#include <stand.h>
#include <efi.h>
diff --git a/stand/i386/libi386/biosacpi.c b/stand/i386/libi386/biosacpi.c
index 077b6c7e53de..8ddd322b9f99 100644
--- a/stand/i386/libi386/biosacpi.c
+++ b/stand/i386/libi386/biosacpi.c
@@ -25,7 +25,7 @@
*/
#include <stand.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
#include <bootstrap.h>
#include <btxv86.h>
#include "libi386.h"
diff --git a/stand/i386/libi386/biospci.c b/stand/i386/libi386/biospci.c
index 5b39eab1e5e5..a89a6d30a1e8 100644
--- a/stand/i386/libi386/biospci.c
+++ b/stand/i386/libi386/biospci.c
@@ -31,7 +31,7 @@
*/
#include <stand.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
#include <bootstrap.h>
#include <isapnp.h>
#include <btxv86.h>
diff --git a/stand/i386/libi386/biospnp.c b/stand/i386/libi386/biospnp.c
index 5b22f066d4ef..c01d2888a9f7 100644
--- a/stand/i386/libi386/biospnp.c
+++ b/stand/i386/libi386/biospnp.c
@@ -29,7 +29,7 @@
*/
#include <stand.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
#include <bootstrap.h>
#include <isapnp.h>
#include <btxv86.h>
diff --git a/stand/liblua/lstd.h b/stand/liblua/lstd.h
index ce3aef4bc5fc..2b601f129566 100644
--- a/stand/liblua/lstd.h
+++ b/stand/liblua/lstd.h
@@ -29,10 +29,10 @@
#include <stand.h>
#include <sys/types.h>
+#include <sys/stdarg.h>
#include <sys/stdint.h>
#include <limits.h>
#include <string.h>
-#include <machine/stdarg.h>
/*
* 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 fc4c25bd9424..d4bce64d9be5 100644
--- a/stand/libofw/ofw_disk.c
+++ b/stand/libofw/ofw_disk.c
@@ -28,11 +28,10 @@
*/
#include <sys/param.h>
+#include <sys/stdarg.h>
#include <netinet/in.h>
-#include <machine/stdarg.h>
-
#include <stand.h>
#include <sys/disk.h>
diff --git a/stand/libofw/openfirm.c b/stand/libofw/openfirm.c
index 58e7d8cbe755..1df65784e47a 100644
--- a/stand/libofw/openfirm.c
+++ b/stand/libofw/openfirm.c
@@ -56,8 +56,7 @@
*/
#include <sys/endian.h>
-
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
#include <stand.h>
diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
index 42ef3e69c18a..f5a1acea843e 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 319f08094d92..a555743f0414 100644
--- a/stand/libsa/panic.c
+++ b/stand/libsa/panic.c
@@ -34,7 +34,7 @@
*/
#include <stand.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
/*
* Boot loaders and other standalone programs that wish to have a
diff --git a/stand/libsa/printf.c b/stand/libsa/printf.c
index a84c5431f536..053b54d31eff 100644
--- a/stand/libsa/printf.c
+++ b/stand/libsa/printf.c
@@ -37,18 +37,13 @@
*/
#include <sys/types.h>
+#include <sys/stdarg.h>
#include <sys/stddef.h>
#include <sys/stdint.h>
#include <limits.h>
#include <string.h>
#include "stand.h"
-/*
- * Note that stdarg.h and the ANSI style va_start macro is used for both
- * ANSI and traditional C compilers.
- */
-#include <machine/stdarg.h>
-
#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 cdacb05c31ce..1a546f3473e2 100644
--- a/stand/powerpc/boot1.chrp/boot1.c
+++ b/stand/powerpc/boot1.chrp/boot1.c
@@ -18,9 +18,11 @@
#include <sys/param.h>
#include <sys/dirent.h>
#include <sys/endian.h>
+#include <sys/stdarg.h>
+
#include <machine/elf.h>
-#include <machine/stdarg.h>
#include <machine/md_var.h>
+
#include <ufs/ffs/fs.h>
#include "paths.h"
diff --git a/stand/uboot/uboot_disk.c b/stand/uboot/uboot_disk.c
index 4f7b6ba06942..1f75f0f6da3c 100644
--- a/stand/uboot/uboot_disk.c
+++ b/stand/uboot/uboot_disk.c
@@ -33,7 +33,8 @@
#include <sys/param.h>
#include <sys/disk.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
+
#include <stand.h>
#include "api_public.h"
diff --git a/sys/amd64/linux/linux_vdso_gtod.c b/sys/amd64/linux/linux_vdso_gtod.c
index 519ca2f2de93..abe42d51a3ac 100644
--- a/sys/amd64/linux/linux_vdso_gtod.c
+++ b/sys/amd64/linux/linux_vdso_gtod.c
@@ -28,6 +28,7 @@
#include <sys/elf.h>
#include <sys/errno.h>
#include <sys/proc.h>
+#include <sys/stdarg.h>
#include <sys/stddef.h>
#define _KERNEL
#include <sys/vdso.h>
@@ -36,7 +37,6 @@
#include <machine/atomic.h>
#include <machine/cpufunc.h>
-#include <machine/stdarg.h>
#include <amd64/linux/linux.h>
#include <amd64/linux/linux_syscall.h>
diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c
index ec5851c45c28..f32db30057d0 100644
--- a/sys/amd64/linux32/linux32_vdso_gtod.c
+++ b/sys/amd64/linux32/linux32_vdso_gtod.c
@@ -28,6 +28,7 @@
#include <sys/elf.h>
#include <sys/errno.h>
#include <sys/proc.h>
+#include <sys/stdarg.h>
#include <sys/stddef.h>
#define _KERNEL
#include <sys/vdso.h>
@@ -36,7 +37,6 @@
#include <i386/include/atomic.h>
#include <i386/include/cpufunc.h>
-#include <i386/include/stdarg.h>
#include <amd64/linux32/linux.h>
#include <amd64/linux32/linux32_syscall.h>
diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c
index ea8f9c18490e..dc3d8b1f9023 100644
--- a/sys/arm/ti/cpsw/if_cpsw.c
+++ b/sys/arm/ti/cpsw/if_cpsw.c
@@ -59,11 +59,11 @@
#include <sys/rman.h>
#include <sys/socket.h>
#include <sys/sockio.h>
+#include <sys/stdarg.h>
#include <sys/sysctl.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/stdarg.h>
#include <net/ethernet.h>
#include <net/bpf.h>
diff --git a/sys/arm/xilinx/zy7_devcfg.c b/sys/arm/xilinx/zy7_devcfg.c
index 6df0fba1f56a..41618225a566 100644
--- a/sys/arm/xilinx/zy7_devcfg.c
+++ b/sys/arm/xilinx/zy7_devcfg.c
@@ -40,6 +40,7 @@
#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/module.h>
+#include <sys/stdarg.h>
#include <sys/sysctl.h>
#include <sys/lock.h>
#include <sys/mutex.h>
@@ -49,7 +50,6 @@
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/stdarg.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/xilinx/zy7_ehci.c b/sys/arm/xilinx/zy7_ehci.c
index 545e2a9bce16..6d84ec751e08 100644
--- a/sys/arm/xilinx/zy7_ehci.c
+++ b/sys/arm/xilinx/zy7_ehci.c
@@ -45,10 +45,10 @@
#include <sys/condvar.h>
#include <sys/resource.h>
#include <sys/rman.h>
+#include <sys/stdarg.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/stdarg.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/xilinx/zy7_gpio.c b/sys/arm/xilinx/zy7_gpio.c
index 091237014c6f..71b6fc3c0586 100644
--- a/sys/arm/xilinx/zy7_gpio.c
+++ b/sys/arm/xilinx/zy7_gpio.c
@@ -53,11 +53,11 @@
#include <sys/mutex.h>
#include <sys/resource.h>
#include <sys/rman.h>
+#include <sys/stdarg.h>
#include <sys/gpio.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/stdarg.h>
#include <dev/gpio/gpiobusvar.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/xilinx/zy7_qspi.c b/sys/arm/xilinx/zy7_qspi.c
index 49d4cafd8d61..42091bc78619 100644
--- a/sys/arm/xilinx/zy7_qspi.c
+++ b/sys/arm/xilinx/zy7_qspi.c
@@ -42,11 +42,11 @@
#include <sys/mutex.h>
#include <sys/resource.h>
#include <sys/rman.h>
+#include <sys/stdarg.h>
#include <sys/uio.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/stdarg.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/xilinx/zy7_slcr.c b/sys/arm/xilinx/zy7_slcr.c
index a46ccb59a07b..40bcff49162b 100644
--- a/sys/arm/xilinx/zy7_slcr.c
+++ b/sys/arm/xilinx/zy7_slcr.c
@@ -42,12 +42,12 @@
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/resource.h>
+#include <sys/stdarg.h>
#include <sys/sysctl.h>
#include <sys/rman.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/stdarg.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/xilinx/zy7_spi.c b/sys/arm/xilinx/zy7_spi.c
index bb5bb7f46767..636a40d729d6 100644
--- a/sys/arm/xilinx/zy7_spi.c
+++ b/sys/arm/xilinx/zy7_spi.c
@@ -34,11 +34,11 @@
#include <sys/mutex.h>
#include <sys/resource.h>
#include <sys/rman.h>
+#include <sys/stdarg.h>
#include <sys/uio.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/stdarg.h>
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm64/linux/linux_vdso_gtod.c b/sys/arm64/linux/linux_vdso_gtod.c
index f7def68d88c4..203c76b6e3a9 100644
--- a/sys/arm64/linux/linux_vdso_gtod.c
+++ b/sys/arm64/linux/linux_vdso_gtod.c
@@ -29,6 +29,7 @@
#include <sys/elf.h>
#include <sys/errno.h>
#include <sys/proc.h>
+#include <sys/stdarg.h>
#include <sys/stddef.h>
#define _KERNEL
#include <sys/vdso.h>
@@ -36,7 +37,6 @@
#include <stdbool.h>
#include <machine/atomic.h>
-#include <machine/stdarg.h>
#include <arm64/linux/linux.h>
#include <arm64/linux/linux_syscall.h>
diff --git a/sys/arm64/qoriq/qoriq_gpio_pic.c b/sys/arm64/qoriq/qoriq_gpio_pic.c
index ec84d2a14ae7..aca8b9daea13 100644
--- a/sys/arm64/qoriq/qoriq_gpio_pic.c
+++ b/sys/arm64/qoriq/qoriq_gpio_pic.c
@@ -34,11 +34,11 @@
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/rman.h>
+#include <sys/stdarg.h>
#include <sys/gpio.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/stdarg.h>
#include <dev/gpio/gpiobusvar.h>
#include <dev/gpio/qoriq_gpio.h>
diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c
index 61cffeda6f0c..e33e1fafa274 100644
--- a/sys/cam/ata/ata_xpt.c
+++ b/sys/cam/ata/ata_xpt.c
@@ -37,6 +37,7 @@
#include <sys/conf.h>
#include <sys/fcntl.h>
#include <sys/sbuf.h>
+#include <sys/stdarg.h>
#include <sys/eventhandler.h>
#include <sys/lock.h>
@@ -57,7 +58,6 @@
#include <cam/scsi/scsi_all.h>
#include <cam/scsi/scsi_message.h>
#include <cam/ata/ata_all.h>
-#include <machine/stdarg.h> /* 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 8428125d5e99..38bc82c69aad 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -44,6 +44,7 @@
#include <sys/proc.h>
#include <sys/sbuf.h>
#include <sys/smp.h>
+#include <sys/stdarg.h>
#include <sys/taskqueue.h>
#include <sys/lock.h>
@@ -68,7 +69,6 @@
#include <cam/scsi/scsi_message.h>
#include <cam/scsi/scsi_pass.h>
-#include <machine/stdarg.h> /* 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 d07541a1a986..debc6b1e29ee 100644
--- a/sys/cam/ctl/ctl_error.c
+++ b/sys/cam/ctl/ctl_error.c
@@ -49,8 +49,8 @@
#include <sys/condvar.h>
#include <sys/stddef.h>
#include <sys/ctype.h>
+#include <sys/stdarg.h>
#include <sys/sysctl.h>
-#include <machine/stdarg.h>
#include <cam/scsi/scsi_all.h>
#include <cam/scsi/scsi_da.h>
diff --git a/sys/cam/ctl/ctl_error.h b/sys/cam/ctl/ctl_error.h
index fb2113bef048..55fb8e30b5e8 100644
--- a/sys/cam/ctl/ctl_error.h
+++ b/sys/cam/ctl/ctl_error.h
@@ -39,7 +39,7 @@
* Author: Ken Merry <ken@FreeBSD.org>
*/
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
#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 b7f1e5bce868..138f96eaaa49 100644
--- a/sys/cam/mmc/mmc_xpt.c
+++ b/sys/cam/mmc/mmc_xpt.c
@@ -38,6 +38,7 @@
#include <sys/fcntl.h>
#include <sys/interrupt.h>
#include <sys/sbuf.h>
+#include <sys/stdarg.h>
#include <sys/lock.h>
#include <sys/mutex.h>
@@ -58,7 +59,6 @@
#include <cam/mmc/mmc.h>
#include <cam/mmc/mmc_bus.h>
-#include <machine/stdarg.h> /* for xpt_print below */
#include <machine/_inttypes.h> /* 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 bac9e6441040..f6667df07be0 100644
--- a/sys/cam/nvme/nvme_xpt.c
+++ b/sys/cam/nvme/nvme_xpt.c
@@ -38,6 +38,7 @@
#include <sys/conf.h>
#include <sys/fcntl.h>
#include <sys/sbuf.h>
+#include <sys/stdarg.h>
#include <sys/lock.h>
#include <sys/mutex.h>
@@ -57,7 +58,6 @@
#include <cam/scsi/scsi_all.h>
#include <cam/scsi/scsi_message.h>
#include <cam/nvme/nvme_all.h>
-#include <machine/stdarg.h> /* 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 944f70e03da6..b6fb66beefcd 100644
--- a/sys/cam/scsi/scsi_all.h
+++ b/sys/cam/scsi/scsi_all.h
@@ -18,7 +18,7 @@
#ifdef _KERNEL
#include <sys/malloc.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
#else
#include <stdarg.h>
#endif
diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c
index 4415e940cd96..9705a0b890b4 100644
--- a/sys/cam/scsi/scsi_enc.c
+++ b/sys/cam/scsi/scsi_enc.c
@@ -39,14 +39,13 @@
#include <sys/proc.h>
#include <sys/queue.h>
#include <sys/sbuf.h>
+#include <sys/stdarg.h>
#include <sys/sx.h>
#include <sys/sysent.h>
#include <sys/systm.h>
#include <sys/sysctl.h>
#include <sys/types.h>
-#include <machine/stdarg.h>
-
#include <cam/cam.h>
#include <cam/cam_ccb.h>
#include <cam/cam_debug.h>
diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c
index 21cb6beaf1fb..2bb59cb2d92b 100644
--- a/sys/cam/scsi/scsi_xpt.c
+++ b/sys/cam/scsi/scsi_xpt.c
@@ -40,6 +40,7 @@
#include <sys/fcntl.h>
#include <sys/md5.h>
#include <sys/sbuf.h>
+#include <sys/stdarg.h>
#include <sys/lock.h>
#include <sys/mutex.h>
@@ -59,7 +60,6 @@
#include <cam/scsi/scsi_all.h>
#include <cam/scsi/scsi_message.h>
#include <cam/scsi/scsi_pass.h>
-#include <machine/stdarg.h> /* 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 ec088f216cb3..4c8eb533e930 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_string.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_string.c
@@ -26,7 +26,7 @@
#include <sys/param.h>
#include <sys/string.h>
#include <sys/kmem.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
#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 2623693ec8b7..b3ebf6414e8b 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 <sys/systm.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
#ifdef __cplusplus
extern "C" {
diff --git a/sys/cddl/compat/opensolaris/sys/varargs.h b/sys/cddl/compat/opensolaris/sys/varargs.h
index 9684502756cb..bede89fafa18 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 <machine/stdarg.h>
+#include <sys/stdarg.h>
#else
#include <stdarg.h>
#endif
diff --git a/sys/cddl/dev/fbt/fbt.c b/sys/cddl/dev/fbt/fbt.c
index 99a77ba65eb8..da9c4ee2ab76 100644
--- a/sys/cddl/dev/fbt/fbt.c
+++ b/sys/cddl/dev/fbt/fbt.c
@@ -49,12 +49,12 @@
#include <sys/proc.h>
#include <sys/selinfo.h>
#include <sys/smp.h>
+#include <sys/stdarg.h>
#include <sys/syscall.h>
#include <sys/sysent.h>
#include <sys/sysproto.h>
#include <sys/uio.h>
#include <sys/unistd.h>
-#include <machine/stdarg.h>
#include <sys/dtrace.h>
#include <sys/dtrace_bsd.h>
diff --git a/sys/cddl/dev/profile/profile.c b/sys/cddl/dev/profile/profile.c
index 3e106aab1c85..23a8c9256708 100644
--- a/sys/cddl/dev/profile/profile.c
+++ b/sys/cddl/dev/profile/profile.c
@@ -48,11 +48,11 @@
#include <sys/proc.h>
#include <sys/selinfo.h>
#include <sys/smp.h>
+#include <sys/stdarg.h>
#include <sys/sysctl.h>
#include <sys/uio.h>
#include <sys/unistd.h>
#include <machine/cpu.h>
-#include <machine/stdarg.h>
#include <sys/dtrace.h>
#include <sys/dtrace_bsd.h>
diff --git a/sys/cddl/dev/systrace/systrace.c b/sys/cddl/dev/systrace/systrace.c
index c14a663d1995..d8fe1a6430c6 100644
--- a/sys/cddl/dev/systrace/systrace.c
+++ b/sys/cddl/dev/systrace/systrace.c
@@ -47,6 +47,7 @@
#include <sys/proc.h>
#include <sys/selinfo.h>
#include <sys/smp.h>
+#include <sys/stdarg.h>
#include <sys/sysent.h>
#include <sys/sysproto.h>
#include <sys/uio.h>
@@ -54,8 +55,6 @@
*** 3126 LINES SKIPPED ***