705a0b890b4 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 ***
> > 
> 
> 
> 
> -- 
> 
> A FreeBSD user