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/vm | |
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/vm')
-rw-r--r-- | sys/vm/device_pager.c | 2 | ||||
-rw-r--r-- | sys/vm/phys_pager.c | 2 | ||||
-rw-r--r-- | sys/vm/vm_fault.c | 3 | ||||
-rw-r--r-- | sys/vm/vm_glue.c | 4 | ||||
-rw-r--r-- | sys/vm/vm_init.c | 3 | ||||
-rw-r--r-- | sys/vm/vm_kern.c | 3 | ||||
-rw-r--r-- | sys/vm/vm_map.c | 3 | ||||
-rw-r--r-- | sys/vm/vm_meter.c | 5 | ||||
-rw-r--r-- | sys/vm/vm_mmap.c | 4 | ||||
-rw-r--r-- | sys/vm/vm_object.c | 8 | ||||
-rw-r--r-- | sys/vm/vm_page.c | 2 | ||||
-rw-r--r-- | sys/vm/vm_pageout.c | 3 | ||||
-rw-r--r-- | sys/vm/vm_unix.c | 2 | ||||
-rw-r--r-- | sys/vm/vm_zone.h | 4 |
14 files changed, 30 insertions, 18 deletions
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index 7d7480c..86f88a3 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -42,6 +42,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <sys/mman.h> #include <sys/sx.h> diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c index 5a6aca5..1f00ea0 100644 --- a/sys/vm/phys_pager.c +++ b/sys/vm/phys_pager.c @@ -30,6 +30,8 @@ #include <sys/linker_set.h> #include <sys/conf.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <sys/mman.h> #include <sys/sysctl.h> #include <sys/sx.h> diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 48120ee..a1bad69 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -75,6 +75,8 @@ #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/resourcevar.h> @@ -82,7 +84,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> -#include <sys/lock.h> #include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/vm_object.h> diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 4f5d9c0..87b13de 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -67,6 +67,8 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/shm.h> @@ -76,14 +78,12 @@ #include <sys/kernel.h> #include <sys/ktr.h> -#include <sys/mutex.h> #include <sys/unistd.h> #include <machine/limits.h> #include <vm/vm.h> #include <vm/vm_param.h> -#include <sys/lock.h> #include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/vm_page.h> diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index c46d37c..ae336e1 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -70,10 +70,11 @@ #include <sys/param.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/proc.h> #include <sys/systm.h> #include <vm/vm.h> -#include <sys/lock.h> #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_map.h> diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 08da921..14e4867 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -70,12 +70,13 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <sys/proc.h> #include <sys/malloc.h> #include <vm/vm.h> #include <vm/vm_param.h> -#include <sys/lock.h> #include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/vm_object.h> diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index cca1067..b33e9e4 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -70,6 +70,8 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <sys/proc.h> #include <sys/vmmeter.h> #include <sys/mman.h> @@ -78,7 +80,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> -#include <sys/lock.h> #include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/vm_page.h> diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index 4f42ee0..5f35e63 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -35,9 +35,11 @@ */ #include <sys/param.h> -#include <sys/proc.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/mutex.h> +#include <sys/proc.h> #include <sys/resource.h> #include <sys/sx.h> #include <sys/vmmeter.h> @@ -46,7 +48,6 @@ #include <vm/vm_page.h> #include <vm/vm_extern.h> #include <vm/vm_param.h> -#include <sys/lock.h> #include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/vm_object.h> diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 6328ff7..14307b3 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -49,8 +49,9 @@ #include "opt_rlimit.h" #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/lock.h> #include <sys/sysproto.h> #include <sys/filedesc.h> #include <sys/proc.h> @@ -65,7 +66,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> -#include <sys/lock.h> #include <vm/pmap.h> #include <vm/vm_map.h> #include <vm/vm_object.h> diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index cc205a8..33fe834 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -70,12 +70,14 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> /* for curproc, pageproc */ -#include <sys/vnode.h> -#include <sys/vmmeter.h> +#include <sys/lock.h> #include <sys/mman.h> #include <sys/mount.h> #include <sys/mutex.h> +#include <sys/proc.h> /* for curproc, pageproc */ +#include <sys/socket.h> +#include <sys/vnode.h> +#include <sys/vmmeter.h> #include <sys/sx.h> #include <vm/vm.h> diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index e332564..5865d70 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -70,6 +70,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/proc.h> #include <sys/vmmeter.h> @@ -77,7 +78,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> -#include <sys/lock.h> #include <vm/vm_kern.h> #include <vm/vm_object.h> #include <vm/vm_page.h> diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index e61dcc1..a7856dd 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -76,6 +76,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <sys/proc.h> #include <sys/kthread.h> #include <sys/ktr.h> @@ -88,7 +90,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> -#include <sys/lock.h> #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_map.h> diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c index bea87f0..f9b24f8 100644 --- a/sys/vm/vm_unix.c +++ b/sys/vm/vm_unix.c @@ -45,13 +45,13 @@ * Traditional sbrk/grow interface to VM */ #include <sys/param.h> +#include <sys/lock.h> #include <sys/sysproto.h> #include <sys/proc.h> #include <sys/resourcevar.h> #include <vm/vm.h> #include <vm/vm_param.h> -#include <sys/lock.h> #include <vm/pmap.h> #include <vm/vm_map.h> diff --git a/sys/vm/vm_zone.h b/sys/vm/vm_zone.h index 8cb5b8e..9b41d0b 100644 --- a/sys/vm/vm_zone.h +++ b/sys/vm/vm_zone.h @@ -21,8 +21,8 @@ #define ZONE_INTERRUPT 1 /* Use this if you need to allocate at int time */ #define ZONE_BOOT 16 /* This is an internal flag used by zbootinit */ -#include <sys/lock.h> /* XXX */ -#include <sys/mutex.h> +#include <sys/_lock.h> +#include <sys/_mutex.h> typedef struct vm_zone { struct mtx zmtx; /* lock for data structure */ |