diff options
Diffstat (limited to 'vm')
| -rw-r--r-- | vm/memory_object.c | 5 | ||||
| -rw-r--r-- | vm/vm_debug.c | 1 | ||||
| -rw-r--r-- | vm/vm_fault.c | 6 | ||||
| -rw-r--r-- | vm/vm_map.c | 2 | ||||
| -rw-r--r-- | vm/vm_object.c | 8 | ||||
| -rw-r--r-- | vm/vm_object.h | 2 | ||||
| -rw-r--r-- | vm/vm_page.h | 2 | ||||
| -rw-r--r-- | vm/vm_pageout.c | 6 | ||||
| -rw-r--r-- | vm/vm_resident.c | 4 |
9 files changed, 8 insertions, 28 deletions
diff --git a/vm/memory_object.c b/vm/memory_object.c index 16e858a..77ec25c 100644 --- a/vm/memory_object.c +++ b/vm/memory_object.c @@ -47,8 +47,8 @@ #include <mach/vm_prot.h> #include <mach/message.h> -#include "memory_object_user.h" -#include "memory_object_default.h" +#include <vm/memory_object_user.user.h> +#include <vm/memory_object_default.user.h> /* * Implementation dependencies: @@ -63,7 +63,6 @@ #include <vm/vm_map.h> /* For vm_map_pageable */ #include <ipc/ipc_port.h> -#include <mach_pagemap.h> #if MACH_PAGEMAP #include <vm/vm_external.h> #endif /* MACH_PAGEMAP */ diff --git a/vm/vm_debug.c b/vm/vm_debug.c index 16165ca..a6e9347 100644 --- a/vm/vm_debug.c +++ b/vm/vm_debug.c @@ -31,7 +31,6 @@ * Exported kernel calls. See mach_debug/mach_debug.defs. */ -#include <mach_vm_debug.h> #if MACH_VM_DEBUG #include <kern/thread.h> diff --git a/vm/vm_fault.c b/vm/vm_fault.c index 42108ed..b757208 100644 --- a/vm/vm_fault.c +++ b/vm/vm_fault.c @@ -32,10 +32,6 @@ * * Page fault handling module. */ -#include <mach_pagemap.h> -#include <mach_kdb.h> -#include <mach_pcsample.h> - #include <vm/vm_fault.h> #include <mach/kern_return.h> @@ -51,7 +47,7 @@ #include <vm/vm_pageout.h> #include <mach/vm_param.h> #include <mach/memory_object.h> -#include "memory_object_user.h" +#include <vm/memory_object_user.user.h> /* For memory_object_data_{request,unlock} */ #include <kern/mach_param.h> #include <kern/macro_help.h> diff --git a/vm/vm_map.c b/vm/vm_map.c index fcd6265..193146c 100644 --- a/vm/vm_map.c +++ b/vm/vm_map.c @@ -4676,8 +4676,6 @@ kern_return_t vm_map_machine_attribute(map, address, size, attribute, value) return ret; } -#include <mach_kdb.h> - #if MACH_KDB diff --git a/vm/vm_object.c b/vm/vm_object.c index 0b57827..e2a5f43 100644 --- a/vm/vm_object.c +++ b/vm/vm_object.c @@ -33,11 +33,9 @@ * Virtual memory object module. */ -#include <mach_pagemap.h> - #include <mach/memory_object.h> -#include "memory_object_default.h" -#include "memory_object_user.h" +#include <vm/memory_object_default.user.h> +#include <vm/memory_object_user.user.h> #include <machine/vm_param.h> #include <ipc/ipc_port.h> #include <ipc/ipc_space.h> @@ -2956,8 +2954,6 @@ vm_object_page_map( } } -#include <mach_kdb.h> - #if MACH_KDB #define printf kdbprintf diff --git a/vm/vm_object.h b/vm/vm_object.h index 940168d..84e658f 100644 --- a/vm/vm_object.h +++ b/vm/vm_object.h @@ -34,8 +34,6 @@ #ifndef _VM_VM_OBJECT_H_ #define _VM_VM_OBJECT_H_ -#include <mach_pagemap.h> - #include <mach/kern_return.h> #include <mach/boolean.h> #include <mach/memory_object.h> diff --git a/vm/vm_page.h b/vm/vm_page.h index 63d8db8..ca76e93 100644 --- a/vm/vm_page.h +++ b/vm/vm_page.h @@ -34,8 +34,6 @@ #ifndef _VM_VM_PAGE_H_ #define _VM_VM_PAGE_H_ -#include <mach_vm_debug.h> - #include <mach/boolean.h> #include <mach/vm_prot.h> #include <mach/vm_param.h> diff --git a/vm/vm_pageout.c b/vm/vm_pageout.c index a8f1b3c..c3d890c 100644 --- a/vm/vm_pageout.c +++ b/vm/vm_pageout.c @@ -34,12 +34,10 @@ * The proverbial page-out daemon. */ -#include <mach_pagemap.h> - #include <mach/mach_types.h> #include <mach/memory_object.h> -#include "memory_object_default.h" -#include "memory_object_user.h" +#include <vm/memory_object_default.user.h> +#include <vm/memory_object_user.user.h> #include <mach/vm_param.h> #include <mach/vm_statistics.h> #include <kern/counters.h> diff --git a/vm/vm_resident.c b/vm/vm_resident.c index 3c5af1c..b939b1d 100644 --- a/vm/vm_resident.c +++ b/vm/vm_resident.c @@ -32,7 +32,6 @@ * * Resident memory management module. */ -#include <cpus.h> #include <mach/vm_prot.h> #include <kern/counters.h> @@ -49,7 +48,6 @@ #include <vm/vm_pageout.h> #include <vm/vm_kern.h> -#include <mach_vm_debug.h> #if MACH_VM_DEBUG #include <mach/kern_return.h> #include <mach_debug/hash_info.h> @@ -1483,7 +1481,7 @@ vm_page_info( } #endif /* MACH_VM_DEBUG */ -#include <mach_kdb.h> + #if MACH_KDB #define printf kdbprintf |