diff options
author | markm <markm@FreeBSD.org> | 2001-05-01 08:13:21 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2001-05-01 08:13:21 +0000 |
commit | bcca5847d5e7a197302d7689cd358f5ce6316d0a (patch) | |
tree | a1f5dea8640fa8bdeebec40477b6fdcf33b3e51b /sys/amd64 | |
parent | 7d3d350edce373e3ec1e8e7fe7d94bb08d031a24 (diff) | |
download | FreeBSD-src-bcca5847d5e7a197302d7689cd358f5ce6316d0a.zip FreeBSD-src-bcca5847d5e7a197302d7689cd358f5ce6316d0a.tar.gz |
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)
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/amd64/fpu.c | 6 | ||||
-rw-r--r-- | sys/amd64/amd64/mp_machdep.c | 20 | ||||
-rw-r--r-- | sys/amd64/amd64/mptable.c | 20 | ||||
-rw-r--r-- | sys/amd64/amd64/pmap.c | 11 | ||||
-rw-r--r-- | sys/amd64/amd64/sys_machdep.c | 8 | ||||
-rw-r--r-- | sys/amd64/include/mptable.h | 20 | ||||
-rw-r--r-- | sys/amd64/isa/intr_machdep.c | 15 | ||||
-rw-r--r-- | sys/amd64/isa/nmi.c | 15 | ||||
-rw-r--r-- | sys/amd64/isa/npx.c | 6 |
9 files changed, 63 insertions, 58 deletions
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 6ec2738..91dbcad 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.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/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 21e6b6e..ff602c4 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/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/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index 21e6b6e..ff602c4 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/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/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 5c5b0bb..93807ee 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/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/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index 5ed16ab..ea56e1d 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/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/amd64/include/mptable.h b/sys/amd64/include/mptable.h index 21e6b6e..ff602c4 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/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/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c index 99f9761..2e9eabc3 100644 --- a/sys/amd64/isa/intr_machdep.c +++ b/sys/amd64/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/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c index 99f9761..2e9eabc3 100644 --- a/sys/amd64/isa/nmi.c +++ b/sys/amd64/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/amd64/isa/npx.c b/sys/amd64/isa/npx.c index 6ec2738..91dbcad 100644 --- a/sys/amd64/isa/npx.c +++ b/sys/amd64/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 |