diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | kern/ipc_kobject.c | 1 | ||||
| -rw-r--r-- | vm/vm_object.h | 12 |
3 files changed, 16 insertions, 0 deletions
@@ -32,6 +32,9 @@ kd_handle_ack, kd_kbd_magic, kdstate2idx, kd_parserest, kdcnmaygetc, kd_slmwd, kd_slmscu, kd_slmscd): Add prototypes. * i386/i386at/kd.c (do_modifier): Add prototype. + * kern/ipc_kobject.c: Include <vm/vm_object.h> + * vm/vm_object.h: Include <sys/types.h> and <ipc/ipc_types.h>. + (vm_object_coalesce, vm_object_pager_wakeup): Add prototypes. 2008-07-04 Samuel Thibault <samuel.thibault@ens-lyon.org> diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c index 49350937..6d9f7852 100644 --- a/kern/ipc_kobject.c +++ b/kern/ipc_kobject.c @@ -45,6 +45,7 @@ #include <ipc/ipc_kmsg.h> #include <ipc/ipc_port.h> #include <ipc/ipc_thread.h> +#include <vm/vm_object.h> #include <device/ds_routines.h> #if MACH_MACHINE_ROUTINES diff --git a/vm/vm_object.h b/vm/vm_object.h index 74732895..c9925709 100644 --- a/vm/vm_object.h +++ b/vm/vm_object.h @@ -34,6 +34,7 @@ #ifndef _VM_VM_OBJECT_H_ #define _VM_VM_OBJECT_H_ +#include <sys/types.h> #include <mach/kern_return.h> #include <mach/boolean.h> #include <mach/memory_object.h> @@ -46,6 +47,7 @@ #include <kern/debug.h> #include <kern/macro_help.h> #include <vm/pmap.h> +#include <ipc/ipc_types.h> #if MACH_PAGEMAP #include <vm/vm_external.h> @@ -235,6 +237,16 @@ extern void vm_object_print(vm_object_t); extern vm_object_t vm_object_request_object(struct ipc_port *); +extern boolean_t vm_object_coalesce( + vm_object_t prev_object, + vm_object_t next_object, + vm_offset_t prev_offset, + vm_offset_t next_offset, + vm_size_t prev_size, + vm_size_t next_size); + +extern void vm_object_pager_wakeup(ipc_port_t pager); + /* * Event waiting handling */ |