diff options
29 files changed, 211 insertions, 146 deletions
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index 6765d0c..f2f7aae 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -35,22 +35,24 @@ */ #include <sys/param.h> -#include <sys/systm.h> -#include <sys/unistd.h> +#include <sys/event.h> +#include <sys/filio.h> +#include <sys/fcntl.h> +#include <sys/file.h> #include <sys/kernel.h> #include <sys/lock.h> #include <sys/mutex.h> #include <sys/malloc.h> -#include <sys/vnode.h> +#include <sys/poll.h> #include <sys/proc.h> /* XXXKSE */ +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/filio.h> -#include <sys/fcntl.h> -#include <sys/file.h> -#include <sys/event.h> -#include <sys/poll.h> +#include <sys/sx.h> +#include <sys/systm.h> #include <sys/un.h> +#include <sys/unistd.h> +#include <sys/vnode.h> #include <fs/fifofs/fifo.h> /* diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 01ea5ab..cb0a682 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -36,24 +36,25 @@ #include "opt_param.h" #include <sys/param.h> -#include <sys/systm.h> +#include <sys/aio.h> /* for aio_swake proto */ #include <sys/domain.h> +#include <sys/event.h> #include <sys/file.h> /* for maxfiles */ #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mutex.h> #include <sys/malloc.h> #include <sys/mbuf.h> +#include <sys/mutex.h> #include <sys/proc.h> #include <sys/protosw.h> #include <sys/resourcevar.h> -#include <sys/stat.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/signalvar.h> +#include <sys/stat.h> +#include <sys/sx.h> #include <sys/sysctl.h> -#include <sys/aio.h> /* for aio_swake proto */ -#include <sys/event.h> +#include <sys/systm.h> int maxsockets; diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 01ea5ab..cb0a682 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -36,24 +36,25 @@ #include "opt_param.h" #include <sys/param.h> -#include <sys/systm.h> +#include <sys/aio.h> /* for aio_swake proto */ #include <sys/domain.h> +#include <sys/event.h> #include <sys/file.h> /* for maxfiles */ #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/mutex.h> #include <sys/malloc.h> #include <sys/mbuf.h> +#include <sys/mutex.h> #include <sys/proc.h> #include <sys/protosw.h> #include <sys/resourcevar.h> -#include <sys/stat.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/signalvar.h> +#include <sys/stat.h> +#include <sys/sx.h> #include <sys/sysctl.h> -#include <sys/aio.h> /* for aio_swake proto */ -#include <sys/event.h> +#include <sys/systm.h> int maxsockets; diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 5e24989..04d670c 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -35,29 +35,30 @@ */ #include <sys/param.h> -#include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/fcntl.h> #include <sys/domain.h> -#include <sys/filedesc.h> -#include <sys/lock.h> +#include <sys/fcntl.h> #include <sys/malloc.h> /* XXX must be before <sys/file.h> */ #include <sys/file.h> -#include <sys/mutex.h> +#include <sys/filedesc.h> +#include <sys/jail.h> +#include <sys/kernel.h> +#include <sys/lock.h> #include <sys/mbuf.h> +#include <sys/mutex.h> #include <sys/namei.h> #include <sys/proc.h> #include <sys/protosw.h> +#include <sys/resourcevar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/resourcevar.h> +#include <sys/signalvar.h> #include <sys/stat.h> +#include <sys/sx.h> #include <sys/sysctl.h> +#include <sys/systm.h> #include <sys/un.h> #include <sys/unpcb.h> #include <sys/vnode.h> -#include <sys/jail.h> -#include <sys/sx.h> #include <vm/uma.h> diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c index 47df8d0..7afab70 100644 --- a/sys/net/raw_usrreq.c +++ b/sys/net/raw_usrreq.c @@ -35,11 +35,14 @@ */ #include <sys/param.h> -#include <sys/systm.h> +#include <sys/lock.h> #include <sys/mbuf.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> +#include <sys/systm.h> #include <net/raw_cb.h> diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index f49f3df..11481fe 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -36,21 +36,24 @@ #include <sys/param.h> -#include <sys/systm.h> +#include <sys/domain.h> #include <sys/kernel.h> -#include <sys/sysctl.h> -#include <sys/proc.h> +#include <sys/jail.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> +#include <sys/proc.h> +#include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/domain.h> -#include <sys/protosw.h> -#include <sys/jail.h> +#include <sys/sx.h> +#include <sys/sysctl.h> +#include <sys/systm.h> #include <net/if.h> -#include <net/route.h> #include <net/raw_cb.h> +#include <net/route.h> MALLOC_DEFINE(M_RTABLE, "routetbl", "routing tables"); diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c index c30d852..4ef497b 100644 --- a/sys/netatalk/ddp_input.c +++ b/sys/netatalk/ddp_input.c @@ -6,15 +6,18 @@ */ #include <sys/param.h> -#include <sys/systm.h> #include <sys/kernel.h> -#include <net/netisr.h> +#include <sys/lock.h> #include <sys/mbuf.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> +#include <sys/systm.h> #include <net/if.h> -#include <net/route.h> #include <net/intrq.h> +#include <net/netisr.h> +#include <net/route.h> #include <netatalk/at.h> #include <netatalk/at_var.h> diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c index 2eefd07..ab6a95a 100644 --- a/sys/netatm/atm_aal5.c +++ b/sys/netatm/atm_aal5.c @@ -36,10 +36,14 @@ */ #include <sys/param.h> -#include <sys/systm.h> +#include <sys/lock.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/stat.h> +#include <sys/sx.h> +#include <sys/systm.h> #include <net/if.h> #include <netatm/port.h> #include <netatm/queue.h> @@ -51,7 +55,6 @@ #include <netatm/atm_stack.h> #include <netatm/atm_pcb.h> #include <netatm/atm_var.h> -#include <sys/stat.h> #ifndef lint __RCSID("@(#) $FreeBSD$"); diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c index 02183f0..09d1c46 100644 --- a/sys/netgraph/ng_socket.c +++ b/sys/netgraph/ng_socket.c @@ -49,18 +49,20 @@ */ #include <sys/param.h> -#include <sys/systm.h> #include <sys/domain.h> #include <sys/errno.h> #include <sys/kernel.h> -#include <sys/filedesc.h> +#include <sys/lock.h> #include <sys/malloc.h> -#include <sys/queue.h> #include <sys/mbuf.h> #include <sys/protosw.h> +#include <sys/queue.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> #include <sys/sysctl.h> +#include <sys/systm.h> #ifdef NOTYET #include <sys/vnode.h> #endif diff --git a/sys/netinet/accf_data.c b/sys/netinet/accf_data.c index d38b165..dd710e6 100644 --- a/sys/netinet/accf_data.c +++ b/sys/netinet/accf_data.c @@ -29,9 +29,12 @@ #define ACCEPT_FILTER_MOD #include <sys/param.h> -#include <sys/sysctl.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/sysctl.h> +#include <sys/signalvar.h> #include <sys/socketvar.h> +#include <sys/sx.h> /* accept filter that holds a socket until data arrives */ diff --git a/sys/netinet/accf_http.c b/sys/netinet/accf_http.c index 73c9af2..0396b3a 100644 --- a/sys/netinet/accf_http.c +++ b/sys/netinet/accf_http.c @@ -31,9 +31,12 @@ #include <sys/param.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/mbuf.h> +#include <sys/signalvar.h> #include <sys/sysctl.h> #include <sys/socketvar.h> -#include <sys/mbuf.h> +#include <sys/sx.h> /* check for GET/HEAD */ static void sohashttpget(struct socket *so, void *arg, int waitflag); diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index d022f72..8f56d2c 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -44,12 +44,15 @@ #include <sys/param.h> #include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/proc.h> -#include <sys/socket.h> #include <sys/protosw.h> +#include <sys/signalvar.h> +#include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> #include <sys/sysctl.h> #include <sys/systm.h> @@ -59,10 +62,10 @@ #include <net/route.h> #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> #include <netinet/in_pcb.h> +#include <netinet/in_systm.h> #include <netinet/in_var.h> +#include <netinet/ip.h> #include <netinet/ip_var.h> /* diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index f9fa8cd..0be45ea 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -16,27 +16,30 @@ #include "opt_random_ip_id.h" #include <sys/param.h> -#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> +#include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/protosw.h> -#include <sys/time.h> -#include <sys/kernel.h> -#include <sys/sysctl.h> #include <sys/sockio.h> +#include <sys/sx.h> +#include <sys/sysctl.h> #include <sys/syslog.h> +#include <sys/systm.h> +#include <sys/time.h> #include <net/if.h> #include <net/route.h> #include <netinet/in.h> +#include <netinet/igmp.h> #include <netinet/in_systm.h> -#include <netinet/ip.h> -#include <netinet/ip_var.h> #include <netinet/in_var.h> -#include <netinet/igmp.h> +#include <netinet/ip.h> #include <netinet/ip_encap.h> #include <netinet/ip_mroute.h> +#include <netinet/ip_var.h> #include <netinet/udp.h> #include <machine/in_cksum.h> diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 3b44d02..86915fc 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -39,15 +39,18 @@ #include "opt_random_ip_id.h" #include <sys/param.h> -#include <sys/systm.h> #include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/proc.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> #include <sys/sysctl.h> +#include <sys/systm.h> #include <vm/uma.h> @@ -57,9 +60,9 @@ #define _IP_VHL #include <netinet/in.h> #include <netinet/in_systm.h> -#include <netinet/ip.h> #include <netinet/in_pcb.h> #include <netinet/in_var.h> +#include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/ip_mroute.h> diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 09be5d2..2a78e5e 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -41,16 +41,19 @@ #include "opt_tcp_input.h" #include <sys/param.h> -#include <sys/systm.h> #include <sys/kernel.h> -#include <sys/sysctl.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/proc.h> /* for proc0 declaration */ #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> +#include <sys/sysctl.h> #include <sys/syslog.h> +#include <sys/systm.h> #include <machine/cpu.h> /* before tcp_seq.h, for tcp_random18() */ @@ -58,19 +61,19 @@ #include <net/route.h> #include <netinet/in.h> +#include <netinet/in_pcb.h> #include <netinet/in_systm.h> +#include <netinet/in_var.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> /* for ICMP_BANDLIM */ -#include <netinet/in_var.h> #include <netinet/icmp_var.h> /* for ICMP_BANDLIM */ -#include <netinet/in_pcb.h> #include <netinet/ip_var.h> #ifdef INET6 #include <netinet/ip6.h> #include <netinet/icmp6.h> -#include <netinet6/nd6.h> -#include <netinet6/ip6_var.h> #include <netinet6/in6_pcb.h> +#include <netinet6/ip6_var.h> +#include <netinet6/nd6.h> #endif #include <netinet/tcp.h> #include <netinet/tcp_fsm.h> diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 09be5d2..2a78e5e 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -41,16 +41,19 @@ #include "opt_tcp_input.h" #include <sys/param.h> -#include <sys/systm.h> #include <sys/kernel.h> -#include <sys/sysctl.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/proc.h> /* for proc0 declaration */ #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> +#include <sys/sysctl.h> #include <sys/syslog.h> +#include <sys/systm.h> #include <machine/cpu.h> /* before tcp_seq.h, for tcp_random18() */ @@ -58,19 +61,19 @@ #include <net/route.h> #include <netinet/in.h> +#include <netinet/in_pcb.h> #include <netinet/in_systm.h> +#include <netinet/in_var.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> /* for ICMP_BANDLIM */ -#include <netinet/in_var.h> #include <netinet/icmp_var.h> /* for ICMP_BANDLIM */ -#include <netinet/in_pcb.h> #include <netinet/ip_var.h> #ifdef INET6 #include <netinet/ip6.h> #include <netinet/icmp6.h> -#include <netinet6/nd6.h> -#include <netinet6/ip6_var.h> #include <netinet6/in6_pcb.h> +#include <netinet6/ip6_var.h> +#include <netinet6/nd6.h> #endif #include <netinet/tcp.h> #include <netinet/tcp_fsm.h> diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 04e68f9..af4769f 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -39,17 +39,20 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/domain.h> +#include <sys/jail.h> #include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> -#include <sys/domain.h> #include <sys/proc.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> #include <sys/sysctl.h> #include <sys/syslog.h> -#include <sys/jail.h> #include <vm/uma.h> @@ -58,18 +61,18 @@ #include <netinet/in.h> #include <netinet/in_systm.h> +#include <netinet/in_pcb.h> +#include <netinet/in_var.h> #include <netinet/ip.h> #ifdef INET6 #include <netinet/ip6.h> #endif -#include <netinet/in_pcb.h> -#include <netinet/in_var.h> +#include <netinet/ip_icmp.h> +#include <netinet/icmp_var.h> #include <netinet/ip_var.h> #ifdef INET6 #include <netinet6/ip6_var.h> #endif -#include <netinet/ip_icmp.h> -#include <netinet/icmp_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 61b3fec..65e1c89 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -70,33 +70,36 @@ #include "opt_ipsec.h" #include <sys/param.h> -#include <sys/systm.h> +#include <sys/domain.h> +#include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/time.h> -#include <sys/kernel.h> +#include <sys/sx.h> #include <sys/syslog.h> -#include <sys/domain.h> +#include <sys/systm.h> +#include <sys/time.h> #include <net/if.h> -#include <net/route.h> #include <net/if_dl.h> #include <net/if_types.h> +#include <net/route.h> #include <netinet/in.h> +#include <netinet/in_pcb.h> #include <netinet/in_var.h> #include <netinet/ip6.h> -#include <netinet6/ip6_var.h> #include <netinet/icmp6.h> -#include <netinet6/mld6_var.h> -#include <netinet/in_pcb.h> -#include <netinet6/in6_pcb.h> -#include <netinet6/nd6.h> #include <netinet6/in6_ifattach.h> +#include <netinet6/in6_pcb.h> #include <netinet6/ip6protosw.h> +#include <netinet6/ip6_var.h> +#include <netinet6/mld6_var.h> +#include <netinet6/nd6.h> #ifdef IPSEC #include <netinet6/ipsec.h> diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 99ef536..9af7e81 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -49,22 +49,25 @@ #include "opt_inet6.h" #include <sys/param.h> -#include <sys/systm.h> #include <sys/callout.h> +#include <sys/errno.h> +#include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> +#include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/sockio.h> -#include <sys/protosw.h> -#include <sys/errno.h> -#include <sys/time.h> -#include <sys/kernel.h> +#include <sys/sx.h> #include <sys/syslog.h> +#include <sys/systm.h> +#include <sys/time.h> #include <net/if.h> -#include <net/route.h> #include <net/raw_cb.h> +#include <net/route.h> #include <netinet/in.h> #include <netinet/in_var.h> diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index ca09142..2dcec0c 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -68,34 +68,37 @@ #include "opt_inet6.h" #include <sys/param.h> +#include <sys/errno.h> +#include <sys/lock.h> #include <sys/malloc.h> -#include <sys/proc.h> #include <sys/mbuf.h> -#include <sys/socket.h> +#include <sys/proc.h> #include <sys/protosw.h> +#include <sys/signalvar.h> +#include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/errno.h> +#include <sys/sx.h> #include <sys/systm.h> #include <net/if.h> -#include <net/route.h> #include <net/if_types.h> +#include <net/route.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/in_systm.h> -#include <netinet/ip6.h> -#include <netinet6/ip6_var.h> -#include <netinet6/ip6_mroute.h> #include <netinet/icmp6.h> #include <netinet/in_pcb.h> +#include <netinet/ip6.h> +#include <netinet6/ip6protosw.h> +#include <netinet6/ip6_mroute.h> #include <netinet6/in6_pcb.h> +#include <netinet6/ip6_var.h> #include <netinet6/nd6.h> -#include <netinet6/ip6protosw.h> +#include <netinet6/raw_ip6.h> #ifdef ENABLE_DEFAULT_SCOPE #include <netinet6/scope6_var.h> #endif -#include <netinet6/raw_ip6.h> #ifdef IPSEC #include <netinet6/ipsec.h> diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 1c1fdb04..20913e6 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -70,36 +70,39 @@ #include "opt_ipsec.h" #include <sys/param.h> +#include <sys/errno.h> #include <sys/kernel.h> +#include <sys/lock.h> #include <sys/mbuf.h> +#include <sys/proc.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/sysctl.h> -#include <sys/errno.h> #include <sys/stat.h> -#include <sys/systm.h> +#include <sys/sx.h> +#include <sys/sysctl.h> #include <sys/syslog.h> -#include <sys/proc.h> +#include <sys/systm.h> #include <net/if.h> -#include <net/route.h> #include <net/if_types.h> +#include <net/route.h> #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> #include <netinet/in_pcb.h> +#include <netinet/in_systm.h> #include <netinet/in_var.h> +#include <netinet/ip.h> +#include <netinet/ip6.h> +#include <netinet/icmp6.h> #include <netinet/ip_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> -#include <netinet/ip6.h> +#include <netinet6/ip6protosw.h> #include <netinet6/ip6_var.h> #include <netinet6/in6_pcb.h> -#include <netinet/icmp6.h> #include <netinet6/udp6_var.h> -#include <netinet6/ip6protosw.h> #ifdef IPSEC #include <netinet6/ipsec.h> diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c index 1261748..f0c803a 100644 --- a/sys/netipx/ipx_usrreq.c +++ b/sys/netipx/ipx_usrreq.c @@ -39,13 +39,16 @@ #include "opt_ipx.h" #include <sys/param.h> -#include <sys/systm.h> #include <sys/kernel.h> +#include <sys/lock.h> #include <sys/mbuf.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> #include <sys/sysctl.h> +#include <sys/systm.h> #include <net/if.h> #include <net/route.h> @@ -53,10 +56,10 @@ #include <netinet/in.h> #include <netipx/ipx.h> -#include <netipx/ipx_pcb.h> #include <netipx/ipx_if.h> -#include <netipx/ipx_var.h> #include <netipx/ipx_ip.h> +#include <netipx/ipx_pcb.h> +#include <netipx/ipx_var.h> /* * IPX protocol implementation. diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c index d7f80d4..189d741 100644 --- a/sys/netipx/spx_usrreq.c +++ b/sys/netipx/spx_usrreq.c @@ -37,15 +37,17 @@ */ #include <sys/param.h> -#include <sys/systm.h> #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/mutex.h> #include <sys/proc.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> +#include <sys/systm.h> #include <net/route.h> #include <netinet/tcp_fsm.h> @@ -54,9 +56,9 @@ #include <netipx/ipx_pcb.h> #include <netipx/ipx_var.h> #include <netipx/spx.h> +#include <netipx/spx_debug.h> #include <netipx/spx_timer.h> #include <netipx/spx_var.h> -#include <netipx/spx_debug.h> /* * SPX protocol implementation. diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c index 5b733cd73..79e4831 100644 --- a/sys/netkey/keysock.c +++ b/sys/netkey/keysock.c @@ -36,7 +36,6 @@ #include <sys/types.h> #include <sys/param.h> -#include <sys/systm.h> #include <sys/domain.h> #include <sys/errno.h> #include <sys/kernel.h> @@ -45,9 +44,12 @@ #include <sys/mbuf.h> #include <sys/mutex.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/sx.h> #include <sys/sysctl.h> +#include <sys/systm.h> #include <net/raw_cb.h> #include <net/route.h> diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c index 1e9da08..e0535b6 100644 --- a/sys/netnatm/natm.c +++ b/sys/netnatm/natm.c @@ -38,15 +38,18 @@ */ #include <sys/param.h> -#include <sys/systm.h> +#include <sys/conf.h> #include <sys/kernel.h> -#include <sys/sockio.h> -#include <sys/protosw.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> +#include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/conf.h> +#include <sys/sockio.h> +#include <sys/sx.h> +#include <sys/systm.h> #include <net/if.h> #include <net/if_atm.h> diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c index 1efd795..bb017bf 100644 --- a/sys/netsmb/smb_trantcp.c +++ b/sys/netsmb/smb_trantcp.c @@ -32,18 +32,21 @@ * $FreeBSD$ */ #include <sys/param.h> -#include <sys/systm.h> +#include <sys/condvar.h> #include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mbuf.h> +#include <sys/poll.h> #include <sys/proc.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/poll.h> -#include <sys/uio.h> +#include <sys/sx.h> #include <sys/sysctl.h> -#include <sys/condvar.h> +#include <sys/systm.h> +#include <sys/uio.h> #include <net/if.h> #include <net/route.h> diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 68611a3..d2d108c 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -37,9 +37,8 @@ #ifndef _SYS_FILEDESC_H_ #define _SYS_FILEDESC_H_ -#include <sys/lock.h> -#include <sys/mutex.h> -#include <sys/sx.h> +#include <sys/_lock.h> +#include <sys/_mutex.h> #include <sys/queue.h> /* @@ -135,24 +134,12 @@ SLIST_HEAD(sigiolst, sigio); #define FILEDESC_LOCK_DESC "filedesc structure" -extern struct sx sigio_lock; - /* Lock a file descriptor table. */ #define FILEDESC_LOCK(fd) mtx_lock(&(fd)->fd_mtx) #define FILEDESC_UNLOCK(fd) mtx_unlock(&(fd)->fd_mtx) #define FILEDESC_LOCKED(fd) mtx_owned(&(fd)->fd_mtx) #define FILEDESC_LOCK_ASSERT(fd, type) mtx_assert(&(fd)->fd_mtx, (type)) -/* - * Lock the pointers for a sigio object in the underlying objects of - * a file descriptor. - */ -#define SIGIO_SLOCK() sx_slock(&sigio_lock) -#define SIGIO_XLOCK() sx_xlock(&sigio_lock) -#define SIGIO_SUNLOCK() sx_sunlock(&sigio_lock) -#define SIGIO_XUNLOCK() sx_xunlock(&sigio_lock) -#define SIGIO_ASSERT(what) sx_assert(&sigio_lock, what) - int closef(struct file *fp, struct thread *p); int dupfdopen(struct thread *td, struct filedesc *fdp, int indx, int dfd, int mode, int error); diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h index 31575c5..b018252 100644 --- a/sys/sys/signalvar.h +++ b/sys/sys/signalvar.h @@ -216,8 +216,20 @@ struct pgrp; struct thread; struct proc; struct sigio; +struct sx; extern int sugid_coredump; /* Sysctl variable kern.sugid_coredump */ +extern struct sx sigio_lock; + +/* + * Lock the pointers for a sigio object in the underlying objects of + * a file descriptor. + */ +#define SIGIO_SLOCK() sx_slock(&sigio_lock) +#define SIGIO_XLOCK() sx_xlock(&sigio_lock) +#define SIGIO_SUNLOCK() sx_sunlock(&sigio_lock) +#define SIGIO_XUNLOCK() sx_xunlock(&sigio_lock) +#define SIGIO_ASSERT(what) sx_assert(&sigio_lock, what) /* * Machine-independent functions: diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 748ce7d..4b765aa 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -38,10 +38,8 @@ #define _SYS_SOCKETVAR_H_ #include <sys/queue.h> /* for TAILQ macros */ -#include <sys/filedesc.h> -#include <sys/lock.h> -#include <sys/mutex.h> -#include <sys/sx.h> +#include <sys/_lock.h> +#include <sys/_mutex.h> #include <sys/selinfo.h> /* for struct selinfo */ #include <vm/uma.h> |