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)

24 files changed, 125 insertions, 98 deletions

diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c
index ec7e216..eae1fcc 100644
--- a/sys/i386/i386/math_emulate.c
+++ b/sys/i386/i386/math_emulate.c
@@ -37,18 +37,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/proc.h>
+#include <sys/user.h>
 
 #include <machine/frame.h>
 #include <machine/reg.h>
 
-#include <sys/proc.h>
-#include <sys/kernel.h>
-
 #include <vm/vm.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
-#include <sys/user.h>
 
 #define __ALIGNED_TEMP_REAL 1
 #include <i386/i386/math_emu.h>
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 21e6b6e..ff602c4 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -34,29 +34,29 @@
 #endif
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cons.h>	/* cngetc() */
+#include <sys/dkstat.h>
+#ifdef GPROF 
+#include <sys/gmon.h>
+#endif
 #include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/smp.h>
-#include <sys/dkstat.h>
-#include <sys/cons.h>	/* cngetc() */
+#include <sys/sysctl.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
-#include <sys/user.h>
-#ifdef GPROF 
-#include <sys/gmon.h>
-#endif
 
 #include <machine/apic.h>
 #include <machine/atomic.h>
diff --git a/sys/i386/i386/mpapic.c b/sys/i386/i386/mpapic.c
index e40f216..eadd5d7 100644
--- a/sys/i386/i386/mpapic.c
+++ b/sys/i386/i386/mpapic.c
@@ -26,10 +26,11 @@
  */
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
+#include <sys/bus.h>
 #include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 
 #include <machine/smptests.h>	/** TEST_TEST1 */
 #include <machine/smp.h>
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 21e6b6e..ff602c4 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -34,29 +34,29 @@
 #endif
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cons.h>	/* cngetc() */
+#include <sys/dkstat.h>
+#ifdef GPROF 
+#include <sys/gmon.h>
+#endif
 #include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/smp.h>
-#include <sys/dkstat.h>
-#include <sys/cons.h>	/* cngetc() */
+#include <sys/sysctl.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
-#include <sys/user.h>
-#ifdef GPROF 
-#include <sys/gmon.h>
-#endif
 
 #include <machine/apic.h>
 #include <machine/atomic.h>
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 5c5b0bb..93807ee 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -74,15 +74,16 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/msgbuf.h>
-#include <sys/vmmeter.h>
+#include <sys/lock.h>
 #include <sys/mman.h>
+#include <sys/msgbuf.h>
+#include <sys/proc.h>
 #include <sys/sx.h>
+#include <sys/user.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <sys/lock.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
@@ -92,8 +93,6 @@
 #include <vm/vm_pager.h>
 #include <vm/vm_zone.h>
 
-#include <sys/user.h>
-
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c
index 292214f..ae285c9a 100644
--- a/sys/i386/i386/procfs_machdep.c
+++ b/sys/i386/i386/procfs_machdep.c
@@ -68,16 +68,18 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/vnode.h>
-#include <sys/systm.h>
+
 #include <machine/reg.h>
 #include <machine/md_var.h>
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 5ed16ab..ea56e1d 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -37,20 +37,20 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
 #include <sys/ipl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/smp.h>
+#include <sys/sysproto.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
-#include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <sys/user.h>
-
 #include <machine/cpu.h>
 #include <machine/pcb_ext.h>	/* pcb.h included by sys/user.h */
 #include <machine/sysarch.h>
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c
index 61c37cc..971adce 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.c
+++ b/sys/i386/ibcs2/ibcs2_fcntl.c
@@ -34,8 +34,10 @@
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
-#include <sys/ttycom.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/sysproto.h>
+#include <sys/ttycom.h>
 
 #include <i386/ibcs2/ibcs2_fcntl.h>
 #include <i386/ibcs2/ibcs2_signal.h>
diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c
index 1350c1a..42190d2 100644
--- a/sys/i386/ibcs2/ibcs2_ioctl.c
+++ b/sys/i386/ibcs2/ibcs2_ioctl.c
@@ -30,16 +30,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/consio.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/filio.h>
 #include <sys/ioctl_compat.h>
-#include <sys/tty.h>
 #include <sys/kbio.h>
-#include <sys/consio.h>
-
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/sysproto.h>
+#include <sys/tty.h>
 
 #include <i386/ibcs2/ibcs2_signal.h>
 #include <i386/ibcs2/ibcs2_socksys.h>
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index b53788f..6f8d7e7 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -55,19 +55,20 @@
  * handled here.
  */
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/dirent.h>
 #include <sys/fcntl.h>
-#include <sys/file.h>
 #include <sys/filedesc.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/mutex.h>
 #include <sys/reboot.h>
 #include <sys/resourcevar.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/sysproto.h>
-#include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/times.h>
 #include <sys/vnode.h>
diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c
index 23b9743..4f90159 100644
--- a/sys/i386/ibcs2/ibcs2_other.c
+++ b/sys/i386/ibcs2/ibcs2_other.c
@@ -32,6 +32,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/sysproto.h>
 
 #include <i386/ibcs2/ibcs2_types.h>
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index 70b5f57..6049142 100644
--- a/sys/i386/ibcs2/ibcs2_signal.c
+++ b/sys/i386/ibcs2/ibcs2_signal.c
@@ -30,6 +30,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/signalvar.h>
 #include <sys/sysproto.h>
 
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index e7cb544..a2f624d 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -31,11 +31,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mman.h>
+#include <sys/fcntl.h>
 #include <sys/imgact.h>
 #include <sys/kernel.h>
-#include <sys/fcntl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 21e6b6e..ff602c4 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -34,29 +34,29 @@
 #endif
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cons.h>	/* cngetc() */
+#include <sys/dkstat.h>
+#ifdef GPROF 
+#include <sys/gmon.h>
+#endif
 #include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/smp.h>
-#include <sys/dkstat.h>
-#include <sys/cons.h>	/* cngetc() */
+#include <sys/sysctl.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
-#include <sys/lock.h>
 #include <vm/vm_map.h>
-#include <sys/user.h>
-#ifdef GPROF 
-#include <sys/gmon.h>
-#endif
 
 #include <machine/apic.h>
 #include <machine/atomic.h>
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index b14b368..2906381 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -69,17 +69,19 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/tty.h>
+#include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
-#include <sys/bus.h>
 #include <sys/interrupt.h>
 #include <sys/ipl.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/syslog.h>
+#include <sys/tty.h>
+
 #include <machine/psl.h>
 
 #include <i386/isa/isa_device.h>
diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c
index 99f9761..2e9eabc3 100644
--- a/sys/i386/isa/intr_machdep.c
+++ b/sys/i386/isa/intr_machdep.c
@@ -42,23 +42,24 @@
 #include "opt_mca.h"
 
 #include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/syslog.h>
+#include <sys/bus.h> 
+#include <sys/errno.h>
+#include <sys/interrupt.h>
 #include <sys/ipl.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/syslog.h>
+#include <sys/systm.h>
 #include <sys/unistd.h>
-#include <sys/errno.h>
-#include <sys/interrupt.h>
+
 #include <machine/md_var.h>
 #include <machine/segments.h>
 #include <machine/intrcnt.h>
-#include <sys/bus.h> 
 
 #if defined(APIC_IO)
 #include <machine/smptests.h>			/** FAST_HI */
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index 99f9761..2e9eabc3 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/isa/nmi.c
@@ -42,23 +42,24 @@
 #include "opt_mca.h"
 
 #include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/syslog.h>
+#include <sys/bus.h> 
+#include <sys/errno.h>
+#include <sys/interrupt.h>
 #include <sys/ipl.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/syslog.h>
+#include <sys/systm.h>
 #include <sys/unistd.h>
-#include <sys/errno.h>
-#include <sys/interrupt.h>
+
 #include <machine/md_var.h>
 #include <machine/segments.h>
 #include <machine/intrcnt.h>
-#include <sys/bus.h> 
 
 #if defined(APIC_IO)
 #include <machine/smptests.h>			/** FAST_HI */
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 6ec2738..91dbcad 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -43,11 +43,13 @@
 #include <sys/bus.h>
 #include <sys/ipl.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
 #include <sys/mutex.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/sysctl.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
 #ifdef NPX_DEBUG
diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h
index 1151298..4c9f540 100644
--- a/sys/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/i386/isa/pcvt/pcvt_hdr.h
@@ -52,18 +52,20 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/proc.h>
-#include <sys/signalvar.h>
-#include <sys/tty.h>
-#include <sys/uio.h>
 #include <sys/callout.h>
+#include <sys/conf.h>
+#include <sys/cons.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/random.h>
+#include <sys/signalvar.h>
 #include <sys/syslog.h>
-#include <sys/malloc.h>
 #include <sys/time.h>
-#include <sys/cons.h>
+#include <sys/tty.h>
+#include <sys/uio.h>
 
 #include <machine/bus.h>
 #include <machine/psl.h>
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index bd47467..39e9e33 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -56,12 +56,14 @@ error "Can only have 1 spigot configured."
 
 #include	<sys/param.h>
 #include	<sys/systm.h>
-#include	<sys/kernel.h>
+#include	<sys/bus.h>
 #include	<sys/conf.h>
+#include	<sys/kernel.h>
+#include	<sys/lock.h>
+#include	<sys/mman.h>
+#include	<sys/mutex.h>
 #include	<sys/proc.h>
 #include	<sys/signalvar.h>
-#include	<sys/mman.h>
-#include	<sys/bus.h>
 
 #include	<machine/frame.h>
 #include	<machine/md_var.h>
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index 48e14f0..d86c62d 100644
--- a/sys/i386/linux/imgact_linux.c
+++ b/sys/i386/linux/imgact_linux.c
@@ -33,14 +33,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/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c
index aaa5cac..fe43527 100644
--- a/sys/i386/linux/linux_machdep.c
+++ b/sys/i386/linux/linux_machdep.c
@@ -29,13 +29,14 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/mman.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
-#include <sys/sysproto.h>
-#include <sys/systm.h>
-#include <sys/unistd.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
+#include <sys/sysproto.h>
+#include <sys/unistd.h>
 
 #include <machine/frame.h>
 #include <machine/psl.h>
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 8050392..e461eab 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -37,14 +37,15 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/sysproto.h>
-#include <sys/sysent.h>
 #include <sys/imgact.h>
 #include <sys/imgact_aout.h>
 #include <sys/imgact_elf.h>
-#include <sys/signalvar.h>
 #include <sys/malloc.h>
+#include <sys/proc.h>
+#include <sys/signalvar.h>
+#include <sys/sysent.h>
+#include <sys/sysproto.h>
+
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_page.h>
@@ -53,6 +54,8 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <machine/cpu.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 
 #include <i386/linux/linux.h>
 #include <i386/linux/linux_proto.h>
diff --git a/sys/i386/svr4/svr4_machdep.c b/sys/i386/svr4/svr4_machdep.c
index 1541835..7346f07 100644
--- a/sys/i386/svr4/svr4_machdep.c
+++ b/sys/i386/svr4/svr4_machdep.c
@@ -31,12 +31,11 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/exec.h>
-#include <sys/lock.h>
-#include <vm/vm.h>
-#include <vm/pmap.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>
 
@@ -49,6 +48,9 @@
 #include <machine/vm86.h>
 #include <machine/vmparam.h>
 
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
 #include <compat/svr4/svr4.h>
 #include <compat/svr4/svr4_types.h>
 #include <compat/svr4/svr4_signal.h>