Undo part of the tangle of having sys/lock.h and sys/mutex.h included in

other "system" header files.

Also help the deprecation of lockmgr.h by making it a sub-include of
sys/lock.h and removing sys/lockmgr.h form kernel .c files.

Sort sys/*.h includes where possible in affected files.

OK'ed by:	bde (with reservations)

9 files changed, 56 insertions, 26 deletions

diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index f0a5427..5818758 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -40,11 +40,14 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/ptrace.h>
 #include <sys/signalvar.h>
 #include <sys/sx.h>
+#include <sys/vnode.h>
+
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>
diff --git a/sys/fs/procfs/procfs_dbregs.c b/sys/fs/procfs/procfs_dbregs.c
index 9487569..d80e28c 100644
--- a/sys/fs/procfs/procfs_dbregs.c
+++ b/sys/fs/procfs/procfs_dbregs.c
@@ -44,11 +44,16 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/systm.h>
+
 #include <machine/reg.h>
+
 #include <miscfs/procfs/procfs.h>
+
 #include <vm/vm.h>
 
 int
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index 6249f52..7e2ff52 100644
--- a/sys/fs/procfs/procfs_fpregs.c
+++ b/sys/fs/procfs/procfs_fpregs.c
@@ -41,11 +41,16 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/systm.h>
+
 #include <machine/reg.h>
+
 #include <miscfs/procfs/procfs.h>
+
 #include <vm/vm.h>
 
 int
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 1caa630..5e4a30c 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -41,12 +41,13 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
+
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index 6f2c8cb..3a2f8d2 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -47,20 +47,22 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/proc.h>
+#include <sys/ptrace.h>
+#include <sys/user.h>
 #include <sys/vnode.h>
+
 #include <miscfs/procfs/procfs.h>
+
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
-#include <sys/user.h>
-#include <sys/ptrace.h>
 
 static int	procfs_rwmem __P((struct proc *curp,
 				  struct proc *p, struct uio *uio));
diff --git a/sys/fs/procfs/procfs_regs.c b/sys/fs/procfs/procfs_regs.c
index 12efe85..ba58517 100644
--- a/sys/fs/procfs/procfs_regs.c
+++ b/sys/fs/procfs/procfs_regs.c
@@ -41,14 +41,19 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/systm.h>
+
 #include <machine/reg.h>
-#include <miscfs/procfs/procfs.h>
+
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 
+#include <miscfs/procfs/procfs.h>
+
 int
 procfs_doregs(curp, p, pfs, uio)
 	struct proc *curp;
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index 40e3fbe..b29b4a9 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -42,18 +42,21 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/exec.h>
+#include <sys/jail.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
-#include <sys/jail.h>
-#include <sys/vnode.h>
-#include <sys/tty.h>
 #include <sys/resourcevar.h>
-#include <miscfs/procfs/procfs.h>
+#include <sys/tty.h>
+#include <sys/vnode.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_param.h>
-#include <sys/exec.h>
+
+#include <miscfs/procfs/procfs.h>
 
 #define DOCHECK() do { if (ps >= psbuf+sizeof(psbuf)) goto bailout; } while (0)
 int
diff --git a/sys/fs/procfs/procfs_subr.c b/sys/fs/procfs/procfs_subr.c
index b960b13..64adecb 100644
--- a/sys/fs/procfs/procfs_subr.c
+++ b/sys/fs/procfs/procfs_subr.c
@@ -41,13 +41,14 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysctl.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
-#include <net/radix.h>
 #include <sys/socket.h>
-#include <sys/mount.h>
+#include <sys/sysctl.h>
 #include <sys/vnode.h>
-#include <sys/malloc.h>
 
 #include <miscfs/procfs/procfs.h>
 
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index f7201fb..2e7b7cb 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -45,23 +45,28 @@
 
 #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/socket.h>
 #include <sys/sx.h>
-#include <sys/vnode.h>
+#include <sys/time.h>
 #include <sys/uio.h>
-#include <sys/mount.h>
-#include <sys/namei.h>
-#include <sys/dirent.h>
-#include <sys/malloc.h>
+#include <sys/vnode.h>
+
 #include <machine/reg.h>
+
 #include <vm/vm_zone.h>
+
 #include <miscfs/procfs/procfs.h>
-#include <sys/pioctl.h>
 
 static int	procfs_access __P((struct vop_access_args *));
 static int	procfs_badop __P((void));