diff options
author | tanimura <tanimura@FreeBSD.org> | 2002-04-30 01:54:54 +0000 |
---|---|---|
committer | tanimura <tanimura@FreeBSD.org> | 2002-04-30 01:54:54 +0000 |
commit | 89ec521d918cc9582731bc57c7d9d39010f3ccba (patch) | |
tree | 949babd3de74c52d345786e2c0f418722c5d6351 /sys/kern | |
parent | c52db1bfdfb3a9e4065f735384e8e23dd29a14c0 (diff) | |
download | FreeBSD-src-89ec521d918cc9582731bc57c7d9d39010f3ccba.zip FreeBSD-src-89ec521d918cc9582731bc57c7d9d39010f3ccba.tar.gz |
Revert the change of #includes in sys/filedesc.h and sys/socketvar.h.
Requested by: bde
Since locking sigio_lock is usually followed by calling pgsigio(),
move the declaration of sigio_lock and the definitions of SIGIO_*() to
sys/signalvar.h.
While I am here, sort include files alphabetically, where possible.
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/uipc_sockbuf.c | 13 | ||||
-rw-r--r-- | sys/kern/uipc_socket2.c | 13 | ||||
-rw-r--r-- | sys/kern/uipc_usrreq.c | 19 |
3 files changed, 24 insertions, 21 deletions
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> |