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

@@ -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

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

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 *

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>

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"
 

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>

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>

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>

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"

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>

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>

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

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>
 

stand/libofw/openfirm.c

@@ -56,8 +56,7 @@
  */
 
 #include <sys/endian.h>
-
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #include <stand.h>
 

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; \

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

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 *);

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"

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"

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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;

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

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>

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_

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");

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;

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

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>

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;

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')
 

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" {

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

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>

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>

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 @@
 
 #include <cddl/dev/dtrace/dtrace_cddl.h>
 
-#include <machine/stdarg.h>
-
 #ifdef LINUX_SYSTRACE
 #if defined(__amd64__)
 #include <amd64/linux/linux.h>

sys/compat/linux/linux_util.c

@@ -40,11 +40,10 @@
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
+#include <sys/stdarg.h>
 #include <sys/syscallsubr.h>
 #include <sys/vnode.h>
 
-#include <machine/stdarg.h>
-
 #include <compat/linux/linux_dtrace.h>
 #include <compat/linux/linux_mib.h>
 #include <compat/linux/linux_util.h>

sys/compat/linuxkpi/common/include/linux/kmod.h

@@ -33,7 +33,7 @@
 #include <sys/syscallsubr.h>
 #include <sys/refcount.h>
 #include <sys/sbuf.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 #include <sys/proc.h>
 
 #define	request_module(...) \

sys/compat/linuxkpi/common/include/linux/kobject.h

@@ -29,7 +29,7 @@
 #ifndef	_LINUXKPI_LINUX_KOBJECT_H_
 #define	_LINUXKPI_LINUX_KOBJECT_H_
 
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #include <linux/kernel.h>
 #include <linux/kref.h>

sys/compat/linuxkpi/common/include/linux/stdarg.h

@@ -28,6 +28,6 @@
 #ifndef _LINUXKPI_STDARG_H_
 #define	_LINUXKPI_STDARG_H_
 
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #endif	/* _LINUXKPI_STDARG_H_ */

sys/compat/linuxkpi/common/include/stdarg.h

@@ -28,6 +28,6 @@
 #ifndef _LINUXKPI_STDARG_H_
 #define	_LINUXKPI_STDARG_H_
 
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #endif	/* _LINUXKPI_STDARG_H_ */

sys/compat/linuxkpi/common/src/linux_compat.c

@@ -50,6 +50,7 @@
 #include <sys/rwlock.h>
 #include <sys/mman.h>
 #include <sys/stack.h>
+#include <sys/stdarg.h>
 #include <sys/sysent.h>
 #include <sys/time.h>
 #include <sys/user.h>
@@ -61,8 +62,6 @@
 #include <vm/vm_pager.h>
 #include <vm/vm_radix.h>
 
-#include <machine/stdarg.h>
-
 #if defined(__i386__) || defined(__amd64__)
 #include <machine/cputypes.h>
 #include <machine/md_var.h>

sys/compat/linuxkpi/common/src/linux_idr.c

@@ -34,8 +34,7 @@
 #include <sys/sysctl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #include <linux/bitmap.h>
 #include <linux/kobject.h>

sys/compat/linuxkpi/common/src/linux_pci.c

@@ -43,13 +43,13 @@
 #include <sys/pctrie.h>
 #include <sys/rman.h>
 #include <sys/rwlock.h>
+#include <sys/stdarg.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/stdarg.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pci_private.h>

sys/contrib/dev/acpica/include/platform/acfreebsd.h

@@ -179,10 +179,10 @@
 
 #include <sys/ctype.h>
 #include <sys/param.h>
+#include <sys/stdarg.h>
 #include <sys/systm.h>
 #include <sys/libkern.h>
 #include <machine/acpica_machdep.h>
-#include <machine/stdarg.h>
 
 #include "opt_acpi.h"
 

sys/contrib/libnv/bsd_nvpair.c

@@ -42,10 +42,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/errno.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/stdarg.h>
 #include <sys/systm.h>
 
-#include <machine/stdarg.h>
-
 #else
 #include <errno.h>
 #include <fcntl.h>

sys/contrib/libnv/cnvlist.c

@@ -38,8 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #else
 #include <stdarg.h>

sys/contrib/libnv/dnvlist.c

@@ -38,8 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #else
 #include <stdarg.h>

sys/contrib/libnv/nvlist.c

@@ -44,8 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
-
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #else
 #include <sys/socket.h>

sys/contrib/ncsw/inc/stdarg_ext.h

@@ -40,7 +40,7 @@
 #elif defined(NCSW_FREEBSD)
 #include <sys/param.h>
 #include <sys/kernel.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #else
 #include <stdarg.h>

sys/contrib/ncsw/user/env/xx.c

@@ -37,6 +37,7 @@
 #include <sys/rman.h>
 #include <sys/sched.h>
 #include <sys/smp.h>
+#include <sys/stdarg.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -45,7 +46,6 @@
 #include <machine/cpufunc.h>
 #include <machine/intr_machdep.h>
 #include <machine/pmap.h>
-#include <machine/stdarg.h>
 
 #include <dev/dpaa/bman.h>
 #include <dev/dpaa/qman.h>

sys/contrib/openzfs/module/os/freebsd/spl/spl_string.c

@@ -30,7 +30,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')
 

sys/contrib/rdma/krping/krping_dev.c

@@ -23,8 +23,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>    /* uio struct */
 #include <sys/malloc.h>
 #include <sys/proc.h>
+#include <sys/stdarg.h>
 #include <sys/sysctl.h>
-#include <machine/stdarg.h>
 
 #include "krping.h"
 

sys/contrib/vchiq/interface/compat/vchi_bsd.c

@@ -36,12 +36,11 @@
 #include <sys/firmware.h>
 #include <sys/param.h>
 #include <sys/proc.h>
+#include <sys/stdarg.h>
 #include <sys/syscallsubr.h>
 #include <sys/systm.h>
 #include <sys/taskqueue.h>
 
-#include <machine/stdarg.h>
-
 #include "mbox_if.h"
 
 #include <interface/compat/vchi_bsd.h>

sys/ddb/db_output.c

@@ -42,10 +42,9 @@
 #include <sys/cons.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
+#include <sys/stdarg.h>
 #include <sys/sysctl.h>
 
-#include <machine/stdarg.h>
-
 #include <ddb/ddb.h>
 #include <ddb/db_output.h>
 

sys/ddb/db_pprint.c

@@ -29,8 +29,7 @@
 #include <sys/systm.h>
 #include <sys/ctype.h>
 #include <sys/linker.h>
-
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_ctf.h>

sys/dev/aacraid/aacraid_debug.c

@@ -51,13 +51,12 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-
 #include <sys/bus.h>
 #include <sys/rman.h>
+#include <sys/stdarg.h>
 
 #include <machine/resource.h>
 #include <machine/bus.h>
-#include <machine/stdarg.h>
 
 #include <dev/aacraid/aacraid_debug.h>
 

sys/dev/ahci/ahci.c

@@ -37,8 +37,8 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sbuf.h>
+#include <sys/stdarg.h>
 #include <sys/sysctl.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ahci/ahci_pci.c

@@ -34,10 +34,10 @@
 #include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#include <sys/stdarg.h>
 #include <sys/sysctl.h>
 #include <sys/taskqueue.h>
 #include <sys/tree.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ahci/ahciem.c

@@ -36,7 +36,7 @@
 #include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/ata-all.c

@@ -37,11 +37,11 @@
 #include <sys/bus.h>
 #include <sys/bio.h>
 #include <sys/malloc.h>
+#include <sys/stdarg.h>
 #include <sys/sysctl.h>
 #include <sys/sema.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/ata-isa.c

@@ -34,9 +34,9 @@
 #include <sys/bus.h>
 #include <sys/malloc.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/ata-pci.c

@@ -36,12 +36,15 @@
 #include <sys/malloc.h>
 #include <sys/sbuf.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
+
 #include <vm/uma.h>
-#include <machine/stdarg.h>
+
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
+
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/ata/ata-all.h>

sys/dev/ata/ata-sata.c

@@ -36,9 +36,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-acard.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-acerlabs.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-amd.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-ati.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-cenatek.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-cypress.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-cyrix.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-highpoint.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-intel.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-ite.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-jmicron.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-marvell.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-micron.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-national.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-netcell.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-nvidia.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-promise.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-serverworks.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-siliconimage.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-sis.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ata/chipsets/ata-via.c

@@ -37,9 +37,9 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
+#include <sys/stdarg.h>
 #include <sys/taskqueue.h>
 #include <vm/uma.h>
-#include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/ath/ah_osdep.c

@@ -42,8 +42,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/conf.h>
-
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
 

sys/dev/bhnd/nvram/bhnd_nvram_private.h

@@ -39,8 +39,7 @@
 
 #ifdef _KERNEL
 #include <sys/malloc.h>
-
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 #else
 #include <stdarg.h>
 #include <stdbool.h>

sys/dev/bhnd/nvram/bhnd_nvram_value.h

@@ -34,7 +34,7 @@
 #include <sys/refcount.h>
 
 #ifdef _KERNEL
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 #else /* !_KERNEL */
 #include <stdarg.h>
 #endif /* _KERNEL */

sys/dev/etherswitch/e6000sw/e6000sw.c

@@ -51,7 +51,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #else
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 #endif
 
 #include "e6000swreg.h"

sys/dev/fdc/fdc.c

@@ -70,6 +70,7 @@
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/rman.h>
+#include <sys/stdarg.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 
@@ -77,7 +78,6 @@
 
 #include <machine/bus.h>
 #include <machine/clock.h>
-#include <machine/stdarg.h>
 
 #include <isa/isavar.h>
 #include <isa/isareg.h>

sys/dev/filemon/filemon_wrapper.c

@@ -33,12 +33,11 @@
 #include <sys/filedesc.h>
 #include <sys/imgact.h>
 #include <sys/priv.h>
+#include <sys/stdarg.h>
 #include <sys/sx.h>
 #include <sys/sysent.h>
 #include <sys/vnode.h>
 
-#include <machine/stdarg.h>
-
 static void filemon_output_event(struct filemon *filemon, const char *fmt, ...)
     __printflike(2, 3);