aboutsummaryrefslogtreecommitdiff
path: root/sys/compat
diff options
context:
space:
mode:
authorMark Murray <markm@FreeBSD.org>2001-05-01 08:13:21 +0000
committerMark Murray <markm@FreeBSD.org>2001-05-01 08:13:21 +0000
commitfb919e4d5a2c1baca52ac70d1064f140fffdda71 (patch)
tree62c0461c4eb61081648eebf963146193ebdc7398 /sys/compat
parent8904de15a20f7c5372ec763d2b637b0997485466 (diff)
Notes
Diffstat (limited to 'sys/compat')
-rw-r--r--sys/compat/linprocfs/linprocfs.c7
-rw-r--r--sys/compat/linprocfs/linprocfs_misc.c7
-rw-r--r--sys/compat/linprocfs/linprocfs_subr.c5
-rw-r--r--sys/compat/linprocfs/linprocfs_vnops.c18
-rw-r--r--sys/compat/linux/linux_file.c11
-rw-r--r--sys/compat/linux/linux_misc.c14
-rw-r--r--sys/compat/linux/linux_signal.c4
-rw-r--r--sys/compat/pecoff/imgact_pecoff.c10
-rw-r--r--sys/compat/svr4/imgact_svr4.c5
-rw-r--r--sys/compat/svr4/svr4_fcntl.c10
-rw-r--r--sys/compat/svr4/svr4_misc.c30
-rw-r--r--sys/compat/svr4/svr4_resource.c3
-rw-r--r--sys/compat/svr4/svr4_signal.c4
-rw-r--r--sys/compat/svr4/svr4_stream.c24
14 files changed, 87 insertions, 65 deletions
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index f1c7fb588c19..2c857400b7de 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -42,18 +42,19 @@
*/
#include <sys/param.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
#include <sys/blist.h>
+#include <sys/conf.h>
#include <sys/dkstat.h>
+#include <sys/jail.h>
#include <sys/kernel.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/resourcevar.h>
#include <sys/sbuf.h>
-#include <sys/systm.h>
#include <sys/tty.h>
#include <sys/vnode.h>
-#include <sys/jail.h>
#include <vm/vm.h>
#include <vm/pmap.h>
diff --git a/sys/compat/linprocfs/linprocfs_misc.c b/sys/compat/linprocfs/linprocfs_misc.c
index f1c7fb588c19..2c857400b7de 100644
--- a/sys/compat/linprocfs/linprocfs_misc.c
+++ b/sys/compat/linprocfs/linprocfs_misc.c
@@ -42,18 +42,19 @@
*/
#include <sys/param.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
#include <sys/blist.h>
+#include <sys/conf.h>
#include <sys/dkstat.h>
+#include <sys/jail.h>
#include <sys/kernel.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/resourcevar.h>
#include <sys/sbuf.h>
-#include <sys/systm.h>
#include <sys/tty.h>
#include <sys/vnode.h>
-#include <sys/jail.h>
#include <vm/vm.h>
#include <vm/pmap.h>
diff --git a/sys/compat/linprocfs/linprocfs_subr.c b/sys/compat/linprocfs/linprocfs_subr.c
index d48d3370e857..09b449e8c43d 100644
--- a/sys/compat/linprocfs/linprocfs_subr.c
+++ b/sys/compat/linprocfs/linprocfs_subr.c
@@ -43,9 +43,12 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/vnode.h>
-#include <sys/malloc.h>
+
#include <compat/linprocfs/linprocfs.h>
static struct pfsnode *pfshead;
diff --git a/sys/compat/linprocfs/linprocfs_vnops.c b/sys/compat/linprocfs/linprocfs_vnops.c
index d9ee5daf8ed3..499e5d4e08d1 100644
--- a/sys/compat/linprocfs/linprocfs_vnops.c
+++ b/sys/compat/linprocfs/linprocfs_vnops.c
@@ -48,22 +48,26 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
+#include <sys/dirent.h>
+#include <sys/fcntl.h>
#include <sys/kernel.h>
#include <sys/lock.h>
-#include <sys/fcntl.h>
+#include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/mutex.h>
+#include <sys/namei.h>
+#include <sys/pioctl.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/sx.h>
+#include <sys/time.h>
#include <sys/vnode.h>
-#include <sys/mount.h>
-#include <sys/namei.h>
-#include <sys/dirent.h>
-#include <sys/malloc.h>
+
#include <machine/reg.h>
+
#include <vm/vm_zone.h>
+
#include <compat/linprocfs/linprocfs.h>
-#include <sys/pioctl.h>
extern struct vnode *procfs_findtextvp __P((struct proc *));
extern int procfs_kmemaccess __P((struct proc *));
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 6f246af68c6e..0f68ab5c6ba1 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -32,18 +32,19 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/sysproto.h>
+#include <sys/conf.h>
+#include <sys/dirent.h>
#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/filedesc.h>
#include <sys/lock.h>
-#include <sys/proc.h>
-#include <sys/vnode.h>
#include <sys/malloc.h>
#include <sys/mount.h>
-#include <sys/dirent.h>
-#include <sys/conf.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/sysproto.h>
#include <sys/tty.h>
+#include <sys/vnode.h>
#include <ufs/ufs/extattr.h>
#include <ufs/ufs/quota.h>
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 127d5b7a9a0a..2c7c9b52e7bd 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -32,23 +32,25 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/sysproto.h>
-#include <sys/kernel.h>
-#include <sys/mman.h>
-#include <sys/proc.h>
#include <sys/fcntl.h>
#include <sys/imgact_aout.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mman.h>
#include <sys/mount.h>
+#include <sys/mutex.h>
#include <sys/namei.h>
+#include <sys/proc.h>
#include <sys/reboot.h>
#include <sys/resourcevar.h>
+#include <sys/signalvar.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
+#include <sys/sysproto.h>
+#include <sys/time.h>
#include <sys/unistd.h>
#include <sys/vnode.h>
#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/signalvar.h>
#include <vm/vm.h>
#include <vm/pmap.h>
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index 3201da66da7f..8a2f8b3ea674 100644
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -30,9 +30,11 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/sysproto.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
+#include <sys/sysproto.h>
#include <machine/../linux/linux.h>
#include <machine/../linux/linux_proto.h>
diff --git a/sys/compat/pecoff/imgact_pecoff.c b/sys/compat/pecoff/imgact_pecoff.c
index 6dff6ba5940a..36b428872088 100644
--- a/sys/compat/pecoff/imgact_pecoff.c
+++ b/sys/compat/pecoff/imgact_pecoff.c
@@ -46,14 +46,15 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/sysent.h>
#include <sys/imgact.h>
-#include <sys/signalvar.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mman.h>
-#include <sys/vnode.h>
#include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/signalvar.h>
+#include <sys/sysent.h>
+#include <sys/vnode.h>
#include <machine/reg.h>
@@ -61,7 +62,6 @@
#include <vm/vm_kern.h>
#include <vm/vm_param.h>
#include <vm/pmap.h>
-#include <sys/lock.h>
#include <vm/vm_map.h>
#include <vm/vm_object.h>
#include <vm/vm_extern.h>
diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c
index ae4f7d21b042..75c3c57da2d2 100644
--- a/sys/compat/svr4/imgact_svr4.c
+++ b/sys/compat/svr4/imgact_svr4.c
@@ -34,14 +34,15 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/resourcevar.h>
#include <sys/exec.h>
-#include <sys/mman.h>
#include <sys/imgact.h>
#include <sys/imgact_aout.h>
#include <sys/kernel.h>
#include <sys/lock.h>
+#include <sys/mman.h>
+#include <sys/mutex.h>
#include <sys/proc.h>
+#include <sys/resourcevar.h>
#include <sys/vnode.h>
#include <vm/vm.h>
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index c2b865a2d280..4fe760fb0464 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -32,15 +32,17 @@
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/namei.h>
-#include <sys/proc.h>
#include <sys/file.h>
-#include <sys/stat.h>
#include <sys/filedesc.h>
/*#include <sys/ioctl.h>*/
+#include <sys/lock.h>
#include <sys/mount.h>
-#include <sys/vnode.h>
+#include <sys/mutex.h>
+#include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/stat.h>
#include <sys/unistd.h>
+#include <sys/vnode.h>
#include <sys/sysproto.h>
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 8a35e845c78e..1baed664b792 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -37,33 +37,33 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/namei.h>
#include <sys/dirent.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
#include <sys/filedesc.h>
#include <sys/jail.h>
#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/file.h> /* Must come after sys/malloc.h */
#include <sys/mman.h>
#include <sys/mount.h>
+#include <sys/msg.h>
+#include <sys/mutex.h>
+#include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/ptrace.h>
#include <sys/resource.h>
#include <sys/resourcevar.h>
+#include <sys/sem.h>
+#include <sys/stat.h>
#include <sys/sx.h>
-#include <sys/vnode.h>
+#include <sys/sysproto.h>
+#include <sys/time.h>
+#include <sys/times.h>
#include <sys/uio.h>
#include <sys/user.h>
+#include <sys/vnode.h>
#include <sys/wait.h>
-#include <sys/times.h>
-#include <sys/fcntl.h>
-#include <sys/sem.h>
-#include <sys/msg.h>
-#include <sys/ptrace.h>
-
-#include <sys/sysproto.h>
#include <compat/svr4/svr4.h>
#include <compat/svr4/svr4_types.h>
diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c
index 873782120d18..2b52140099ed 100644
--- a/sys/compat/svr4/svr4_resource.c
+++ b/sys/compat/svr4/svr4_resource.c
@@ -74,8 +74,9 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/file.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
#include <sys/resource.h>
#include <sys/resourcevar.h>
diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c
index 87b9c7857e87..8a855bfd1252 100644
--- a/sys/compat/svr4/svr4_signal.c
+++ b/sys/compat/svr4/svr4_signal.c
@@ -30,8 +30,10 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/filedesc.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
#include <sys/signal.h>
#include <sys/signalvar.h>
#include <sys/sysproto.h>
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 843a26b31737..ed7c8fa90520 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -41,25 +41,27 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/file.h>
-#include <sys/filedesc.h>
#include <sys/fcntl.h>
+#include <sys/filedesc.h>
#include <sys/filio.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/un.h>
-#include <netinet/in.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/file.h> /* Must come after sys/malloc.h */
#include <sys/mbuf.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
#include <sys/protosw.h>
#include <sys/signal.h>
#include <sys/signalvar.h>
-#include <sys/uio.h>
-#include <sys/ktrace.h>
-#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
#include <sys/stat.h>
-
#include <sys/sysproto.h>
+#include <sys/uio.h>
+#include <sys/ktrace.h> /* Must come after sys/uio.h */
+#include <sys/un.h>
+
+#include <netinet/in.h>
#include <compat/svr4/svr4.h>
#include <compat/svr4/svr4_types.h>