svn commit: r327534 - in user/jeff/numa/sys: arm/arm ddb kern netpfil/ipfw sys

[Rodney W. Grimes]

> Author: jeff
> Date: Thu Jan  4 00:02:47 2018
> New Revision: 327534
> URL: https://svnweb.freebsd.org/changeset/base/327534
> 
> Log:
>   The inclusion of _vm_domain.h in proc.h created pollution from seq.h that
>   many files now rely on.  Fix a small number of these to remove seq.h, lock.h,
>   and _vm_domain.h.  Explicitly add systm.h, types.h and machine/cpu.h so the
>   rest still compiles and the pollution is direct.

Wouldnt it be best to fix this in HEAD rather than have this come in
as part of your NUMA changes?  This is a generic issue, un related to
the numa stuff.

Just a thought, I know it is a merge conflict with your branch, but
it also reduces the diff from your branch current.

> 
> Modified:
>   user/jeff/numa/sys/arm/arm/machdep_ptrace.c
>   user/jeff/numa/sys/ddb/db_run.c
>   user/jeff/numa/sys/kern/subr_kdb.c
>   user/jeff/numa/sys/netpfil/ipfw/dn_sched_fq_codel.c
>   user/jeff/numa/sys/sys/proc.h
> 
> Modified: user/jeff/numa/sys/arm/arm/machdep_ptrace.c
> ==============================================================================
> --- user/jeff/numa/sys/arm/arm/machdep_ptrace.c	Wed Jan  3 23:59:29 2018	(r327533)
> +++ user/jeff/numa/sys/arm/arm/machdep_ptrace.c	Thu Jan  4 00:02:47 2018	(r327534)
> @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
>  #include <sys/param.h>
>  #include <sys/proc.h>
>  #include <sys/ptrace.h>
> +#include <sys/lock.h>
>  #include <sys/mutex.h>
>  
>  #include <machine/machdep.h>
> 
> Modified: user/jeff/numa/sys/ddb/db_run.c
> ==============================================================================
> --- user/jeff/numa/sys/ddb/db_run.c	Wed Jan  3 23:59:29 2018	(r327533)
> +++ user/jeff/numa/sys/ddb/db_run.c	Thu Jan  4 00:02:47 2018	(r327534)
> @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
>  #include <sys/param.h>
>  #include <sys/kdb.h>
>  #include <sys/proc.h>
> +#include <sys/systm.h>
>  
>  #include <machine/kdb.h>
>  #include <machine/pcb.h>
> 
> Modified: user/jeff/numa/sys/kern/subr_kdb.c
> ==============================================================================
> --- user/jeff/numa/sys/kern/subr_kdb.c	Wed Jan  3 23:59:29 2018	(r327533)
> +++ user/jeff/numa/sys/kern/subr_kdb.c	Thu Jan  4 00:02:47 2018	(r327534)
> @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
>  #include <sys/kdb.h>
>  #include <sys/kernel.h>
>  #include <sys/malloc.h>
> +#include <sys/lock.h>
>  #include <sys/pcpu.h>
>  #include <sys/proc.h>
>  #include <sys/sbuf.h>
> 
> Modified: user/jeff/numa/sys/netpfil/ipfw/dn_sched_fq_codel.c
> ==============================================================================
> --- user/jeff/numa/sys/netpfil/ipfw/dn_sched_fq_codel.c	Wed Jan  3 23:59:29 2018	(r327533)
> +++ user/jeff/numa/sys/netpfil/ipfw/dn_sched_fq_codel.c	Thu Jan  4 00:02:47 2018	(r327534)
> @@ -44,6 +44,7 @@
>  #include <netinet/ip_fw.h>	/* flow_id */
>  #include <netinet/ip_dummynet.h>
>  
> +#include <sys/lock.h>
>  #include <sys/proc.h>
>  #include <sys/rwlock.h>
>  
> 
> Modified: user/jeff/numa/sys/sys/proc.h
> ==============================================================================
> --- user/jeff/numa/sys/sys/proc.h	Wed Jan  3 23:59:29 2018	(r327533)
> +++ user/jeff/numa/sys/sys/proc.h	Thu Jan  4 00:02:47 2018	(r327534)
> @@ -62,12 +62,17 @@
>  #include <sys/time.h>			/* For structs itimerval, timeval. */
>  #else
>  #include <sys/pcpu.h>
> +#include <sys/systm.h>
>  #endif
>  #include <sys/ucontext.h>
>  #include <sys/ucred.h>
> -#include <sys/_vm_domain.h>
> +#include <sys/types.h>
>  #include <sys/domainset.h>
> +
>  #include <machine/proc.h>		/* Machine-dependent proc substruct. */
> +#ifdef _KERNEL
> +#include <machine/cpu.h>
> +#endif
>  
>  
>  /*
> @@ -181,6 +186,7 @@ struct procdesc;
>  struct racct;
>  struct sbuf;
>  struct sleepqueue;
> +struct socket;
>  struct syscall_args;
>  struct td_sched;
>  struct thread;
> 
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org