This also reverts 566c227636481b246d928772ebeaacbc7c37145b and
963b1794d7117064cee8ab5638b329db51dad854
---
Makefrag.am | 3 -
ddb/db_aout.c | 2 +-
ddb/db_ext_symtab.c | 4 +-
ddb/db_sym.c | 4 +-
ddb/db_sym.h | 6 +-
ipc/mach_debug.c | 2 +-
ipc/mach_port.c | 1 +
ipc/mach_port.h | 132 ---------------------------------------
kern/bootstrap.c | 2 +-
kern/host.c | 2 +-
kern/ipc_host.c | 2 +-
kern/ipc_mig.c | 2 +-
kern/ipc_tt.c | 5 +-
kern/mach4.h | 66 --------------------
kern/mach_debug.h | 113 ---------------------------------
kern/mach_host.h | 86 -------------------------
kern/machine.c | 2 +-
kern/pc_sample.c | 8 +--
kern/slab.c | 1 +
kern/syscall_emulation.c | 1 +
kern/syscall_sw.c | 2 +-
kern/task.c | 3 +
kern/thread.c | 6 +-
vm/memory_object.c | 4 +-
vm/vm_debug.c | 2 +-
vm/vm_map.c | 1 +
vm/vm_object.c | 1 +
vm/vm_user.c | 4 +-
28 files changed, 40 insertions(+), 427 deletions(-)
delete mode 100644 kern/mach4.h
delete mode 100644 kern/mach_debug.h
delete mode 100644 kern/mach_host.h
diff --git a/Makefrag.am b/Makefrag.am
index 60aeffe0..bdf61246 100644
--- a/Makefrag.am
+++ b/Makefrag.am
@@ -169,11 +169,8 @@ libkernel_a_SOURCES += \
kern/log2.h \
kern/mach_clock.c \
kern/mach_clock.h \
- kern/mach_debug.h \
kern/mach_factor.c \
kern/mach_factor.h \
- kern/mach_host.h \
- kern/mach4.h \
kern/machine.c \
kern/machine.h \
kern/macros.h \
diff --git a/ddb/db_aout.c b/ddb/db_aout.c
index 8f344d6d..7b769c1c 100644
--- a/ddb/db_aout.c
+++ b/ddb/db_aout.c
@@ -75,7 +75,7 @@ aout_db_sym_init(
char * esymtab, /* pointer to end of string table,
for checking - may be rounded up to
integer boundary */
- char * name,
+ const char * name,
char * task_addr) /* use for this task only */
{
struct nlist *sym_start, *sym_end;
diff --git a/ddb/db_ext_symtab.c b/ddb/db_ext_symtab.c
index 9c89fb95..db7bec25 100644
--- a/ddb/db_ext_symtab.c
+++ b/ddb/db_ext_symtab.c
@@ -35,7 +35,7 @@
#include <vm/vm_kern.h>
#include <vm/vm_user.h>
#include <kern/host.h>
-#include <kern/mach_debug.h>
+#include <kern/mach_debug.server.h>
#include <kern/task.h>
#include <ddb/db_sym.h>
@@ -50,7 +50,7 @@ kern_return_t
host_load_symbol_table(
host_t host,
task_t task,
- char * name,
+ const char * name,
pointer_t symtab,
unsigned int symtab_count)
{
diff --git a/ddb/db_sym.c b/ddb/db_sym.c
index d205ff74..a247b645 100644
--- a/ddb/db_sym.c
+++ b/ddb/db_sym.c
@@ -60,7 +60,7 @@ db_add_symbol_table(
int type,
char *start,
char *end,
- char *name,
+ const char *name,
char *ref,
char *map_pointer)
{
@@ -506,7 +506,7 @@ void db_free_symbol(db_sym_t s)
*/
static void dummy_db_free_symbol(db_sym_t symbol) { }
-static boolean_t dummy_db_sym_init(char *a, char *b, char *c, char *d) {
+static boolean_t dummy_db_sym_init(char *a, char *b, const char *c, char *d) {
return FALSE;
}
diff --git a/ddb/db_sym.h b/ddb/db_sym.h
index 8b586996..bc8a10dd 100644
--- a/ddb/db_sym.h
+++ b/ddb/db_sym.h
@@ -94,7 +94,7 @@ extern boolean_t db_qualify_ambiguous_names;
extern boolean_t db_add_symbol_table( int type,
char * start,
char * end,
- char *name,
+ const char *name,
char *ref,
char *map_pointer );
@@ -186,7 +186,7 @@ extern struct db_sym_switch {
boolean_t (*init)(
char *start,
char *end,
- char *name,
+ const char *name,
char *task_addr
);
@@ -241,7 +241,7 @@ extern boolean_t db_line_at_pc(
extern boolean_t aout_db_sym_init(
char *symtab,
char *esymtab,
- char *name,
+ const char *name,
char *task_addr);
extern boolean_t elf_db_sym_init (
diff --git a/ipc/mach_debug.c b/ipc/mach_debug.c
index 57c3133a..7dca4b6b 100644
--- a/ipc/mach_debug.c
+++ b/ipc/mach_debug.c
@@ -41,7 +41,7 @@
#include <mach/vm_param.h>
#include <mach_debug/hash_info.h>
#include <kern/host.h>
-#include <kern/mach_debug.h>
+#include <kern/mach_debug.server.h>
#include <vm/vm_map.h>
#include <vm/vm_kern.h>
#include <ipc/ipc_space.h>
diff --git a/ipc/mach_port.c b/ipc/mach_port.c
index 67713a50..b35d8bcf 100644
--- a/ipc/mach_port.c
+++ b/ipc/mach_port.c
@@ -60,6 +60,7 @@
#include <ipc/ipc_pset.h>
#include <ipc/ipc_right.h>
#include <ipc/mach_port.h>
+#include <ipc/mach_port.server.h>
/*
diff --git a/ipc/mach_port.h b/ipc/mach_port.h
index ec260b31..e91e4952 100644
--- a/ipc/mach_port.h
+++ b/ipc/mach_port.h
@@ -34,136 +34,4 @@
void db_debug_port_references (boolean_t enable);
#endif /* MACH_KDB */
-/* RPCs */
-
-extern kern_return_t
-mach_port_allocate_name (
- ipc_space_t space,
- mach_port_right_t right,
- mach_port_name_t name);
-
-extern kern_return_t
-mach_port_allocate (
- ipc_space_t space,
- mach_port_right_t right,
- mach_port_name_t *namep);
-
-extern kern_return_t
-mach_port_destroy(
- ipc_space_t space,
- mach_port_name_t name);
-
-extern kern_return_t
-mach_port_deallocate(
- ipc_space_t space,
- mach_port_name_t name);
-
-extern kern_return_t
-mach_port_insert_right(
- ipc_space_t space,
- mach_port_name_t name,
- ipc_port_t poly,
- mach_msg_type_name_t polyPoly);
-
-kern_return_t
-mach_port_get_receive_status(
- ipc_space_t space,
- mach_port_name_t name,
- mach_port_status_t *statusp);
-
-kern_return_t
-mach_port_names(
- ipc_space_t space,
- mach_port_name_t **namesp,
- mach_msg_type_number_t *namesCnt,
- mach_port_type_t **typesp,
- mach_msg_type_number_t *typesCnt);
-
-kern_return_t
-mach_port_type(
- ipc_space_t space,
- mach_port_name_t name,
- mach_port_type_t *typep);
-
-kern_return_t
-mach_port_rename(
- ipc_space_t space,
- mach_port_name_t oname,
- mach_port_name_t nname);
-
-kern_return_t
-mach_port_get_refs(
- ipc_space_t space,
- mach_port_name_t name,
- mach_port_right_t right,
- mach_port_urefs_t *urefsp);
-
-kern_return_t
-mach_port_mod_refs(
- ipc_space_t space,
- mach_port_name_t name,
- mach_port_right_t right,
- mach_port_delta_t delta);
-
-kern_return_t
-mach_port_set_qlimit(
- ipc_space_t space,
- mach_port_name_t name,
- mach_port_msgcount_t qlimit);
-
-kern_return_t
-mach_port_set_mscount(
- ipc_space_t space,
- mach_port_name_t name,
- mach_port_mscount_t mscount);
-
-kern_return_t
-mach_port_set_seqno(
- ipc_space_t space,
- mach_port_name_t name,
- mach_port_seqno_t seqno);
-
-kern_return_t
-mach_port_get_set_status(
- ipc_space_t space,
- mach_port_name_t name,
- mach_port_name_t **members,
- mach_msg_type_number_t *membersCnt);
-
-kern_return_t
-mach_port_move_member(
- ipc_space_t space,
- mach_port_name_t member,
- mach_port_name_t after);
-
-kern_return_t
-mach_port_request_notification(
- ipc_space_t space,
- mach_port_name_t name,
- mach_msg_id_t id,
- mach_port_mscount_t sync,
- ipc_port_t notify,
- ipc_port_t *previousp);
-
-kern_return_t
-mach_port_extract_right(
- ipc_space_t space,
- mach_port_name_t name,
- mach_msg_type_name_t msgt_name,
- ipc_port_t *poly,
- mach_msg_type_name_t *polyPoly);
-
-kern_return_t
-mach_port_set_protected_payload(
- ipc_space_t space,
- mach_port_name_t name,
- rpc_uintptr_t payload);
-
-kern_return_t
-mach_port_clear_protected_payload(
- ipc_space_t space,
- mach_port_name_t name);
-
-/* End of RPCs */
-
#endif /* _IPC_MACH_PORT_H_ */
diff --git a/kern/bootstrap.c b/kern/bootstrap.c
index fdc75757..91f4241e 100644
--- a/kern/bootstrap.c
+++ b/kern/bootstrap.c
@@ -39,7 +39,7 @@
#include <machine/vm_param.h>
#include <machine/pcb.h>
#include <ipc/ipc_port.h>
-#include <ipc/mach_port.h>
+#include <ipc/mach_port.server.h>
#include <kern/bootstrap.h>
#include <kern/debug.h>
#include <kern/host.h>
diff --git a/kern/host.c b/kern/host.c
index 4490a8e1..7ce8edff 100644
--- a/kern/host.c
+++ b/kern/host.c
@@ -42,7 +42,7 @@
#include <kern/processor.h>
#include <kern/ipc_host.h>
#include <kern/mach_clock.h>
-#include <kern/mach_host.h>
+#include <kern/mach_host.server.h>
#include <mach/vm_param.h>
host_data_t realhost;
diff --git a/kern/ipc_host.c b/kern/ipc_host.c
index 0f35689a..6b818623 100644
--- a/kern/ipc_host.c
+++ b/kern/ipc_host.c
@@ -35,7 +35,7 @@
#include <mach/message.h>
#include <kern/debug.h>
#include <kern/host.h>
-#include <kern/mach_host.h>
+#include <kern/mach_host.server.h>
#include <kern/processor.h>
#include <kern/task.h>
#include <kern/thread.h>
diff --git a/kern/ipc_mig.c b/kern/ipc_mig.c
index a1757da3..ec121cf4 100644
--- a/kern/ipc_mig.c
+++ b/kern/ipc_mig.c
@@ -50,7 +50,7 @@
#include <ipc/ipc_port.h>
#include <ipc/ipc_pset.h>
#include <ipc/ipc_thread.h>
-#include <ipc/mach_port.h>
+#include <ipc/mach_port.server.h>
#include <device/dev_hdr.h>
#include <device/device_types.h>
#include <device/ds_routines.h>
diff --git a/kern/ipc_tt.c b/kern/ipc_tt.c
index 63f6e77a..7c9a0b8d 100644
--- a/kern/ipc_tt.c
+++ b/kern/ipc_tt.c
@@ -42,6 +42,7 @@
#include <kern/thread.h>
#include <kern/ipc_kobject.h>
#include <kern/ipc_tt.h>
+#include <kern/mach.server.h>
#include <ipc/ipc_space.h>
#include <ipc/ipc_table.h>
#include <ipc/ipc_port.h>
@@ -888,7 +889,7 @@ mach_ports_register(
kern_return_t
mach_ports_lookup(
task_t task,
- ipc_port_t **portsp,
+ mach_port_t **portsp,
mach_msg_type_number_t *portsCnt)
{
vm_offset_t memory;
@@ -925,7 +926,7 @@ mach_ports_lookup(
itk_unlock(task);
- *portsp = ports;
+ *portsp = (mach_port_t *)ports;
*portsCnt = TASK_PORT_REGISTER_MAX;
return KERN_SUCCESS;
}
diff --git a/kern/mach4.h b/kern/mach4.h
deleted file mode 100644
index bff5d187..00000000
--- a/kern/mach4.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2023 Free Software Foundation, Inc.
- *
- * This file is part of GNU Mach.
- *
- * GNU Mach is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef _KERN_MACH4_H
-#define _KERN_MACH4_H
-
-#include <kern/thread.h>
-
-/* RPCs */
-
-kern_return_t
-thread_enable_pc_sampling(
- thread_t thread,
- int *tickp,
- sampled_pc_flavor_t flavors);
-
-kern_return_t
-thread_disable_pc_sampling(
- thread_t thread,
- int *samplecntp);
-
-kern_return_t
-task_enable_pc_sampling(
- task_t task,
- int *tickp,
- sampled_pc_flavor_t flavors);
-
-kern_return_t
-task_disable_pc_sampling(
- task_t task,
- int *samplecntp);
-
-kern_return_t
-thread_get_sampled_pcs(
- thread_t thread,
- sampled_pc_seqno_t *seqnop,
- sampled_pc_array_t sampled_pcs_out,
- int *sampled_pcs_cntp);
-
-kern_return_t
-task_get_sampled_pcs(
- task_t task,
- sampled_pc_seqno_t *seqnop,
- sampled_pc_array_t sampled_pcs_out,
- int *sampled_pcs_cntp);
-
-/* End of RPCs */
-
-#endif /* _KERN_MACH4_H */
diff --git a/kern/mach_debug.h b/kern/mach_debug.h
deleted file mode 100644
index 3d49b321..00000000
--- a/kern/mach_debug.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2023 Free Software Foundation, Inc.
- *
- * This file is part of GNU Mach.
- *
- * GNU Mach is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef _KERN_MACH_DEBUG_H
-#define _KERN_MACH_DEBUG_H
-
-#include <mach/mach_types.h> /* task_t, pointer_t */
-#include <kern/task.h>
-
-/* RPCs */
-
-#if defined(MACH_KDB) && defined(MACH_DEBUG)
-kern_return_t host_load_symbol_table(
- host_t host,
- task_t task,
- char *name,
- pointer_t symtab,
- unsigned int symbtab_count);
-#endif /* defined(MACH_KDB) && defined(MACH_DEBUG) */
-
-kern_return_t
-mach_port_get_srights(
- ipc_space_t space,
- mach_port_name_t name,
- mach_port_rights_t *srightsp);
-
-kern_return_t
-mach_port_dnrequest_info(
- ipc_space_t space,
- mach_port_name_t name,
- unsigned int *totalp,
- unsigned int *usedp);
-
-kern_return_t
-mach_port_kernel_object(
- ipc_space_t space,
- mach_port_name_t name,
- unsigned int *typep,
- vm_offset_t *addrp);
-
-kern_return_t
-host_ipc_marequest_info(
- host_t host,
- unsigned int *maxp,
- hash_info_bucket_array_t *infop,
- unsigned int *countp);
-
-#if MACH_DEBUG
-kern_return_t host_slab_info(host_t host, cache_info_array_t *infop,
- unsigned int *infoCntp);
-#endif /* MACH_DEBUG */
-
-kern_return_t processor_set_stack_usage(
- processor_set_t pset,
- unsigned int *totalp,
- vm_size_t *spacep,
- vm_size_t *residentp,
- vm_size_t *maxusagep,
- vm_offset_t *maxstackp);
-
-kern_return_t host_stack_usage(
- host_t host,
- vm_size_t *reservedp,
- unsigned int *totalp,
- vm_size_t *spacep,
- vm_size_t *residentp,
- vm_size_t *maxusagep,
- vm_offset_t *maxstackp);
-
-kern_return_t
-mach_vm_region_info(
- vm_map_t map,
- vm_offset_t address,
- vm_region_info_t *regionp,
- ipc_port_t *portp);
-
-kern_return_t
-mach_vm_object_info(
- vm_object_t object,
- vm_object_info_t *infop,
- ipc_port_t *shadowp,
- ipc_port_t *copyp);
-
-kern_return_t
-mach_vm_object_pages(
- vm_object_t object,
- vm_page_info_array_t *pagesp,
- natural_t *countp);
-
-kern_return_t
-host_virtual_physical_table_info(const host_t host,
- hash_info_bucket_array_t *infop, natural_t *countp);
-
-/* End of RPCs */
-
-#endif /* _KERN_MACH_DEBUG_H */
diff --git a/kern/mach_host.h b/kern/mach_host.h
deleted file mode 100644
index de644494..00000000
--- a/kern/mach_host.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2023 Free Software Foundation, Inc.
- *
- * This file is part of GNU Mach.
- *
- * GNU Mach is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef _KERN_MACH_HOST_H
-#define _KERN_MACH_HOST_H
-
-#include <kern/processor.h>
-#include <kern/host.h>
-#include <mach/host_info.h>
-
-/* RPCs */
-
-kern_return_t host_processors(
- const host_t host,
- processor_array_t *processor_list,
- natural_t *countp);
-
-kern_return_t host_info(
- const host_t host,
- int flavor,
- host_info_t info,
- natural_t *count);
-
-kern_return_t host_kernel_version(
- const host_t host,
- kernel_version_t out_version);
-
-kern_return_t
-host_processor_sets(
- const host_t host,
- processor_set_name_array_t *pset_list,
- natural_t *count);
-
-kern_return_t
-host_processor_set_priv(
- const host_t host,
- processor_set_t pset_name,
- processor_set_t *pset);
-
-kern_return_t
-processor_set_default(
- const host_t host,
- processor_set_t *pset);
-
-kern_return_t
-host_reboot(const host_t host, int options);
-
-kern_return_t
-host_get_boot_info(
- host_t priv_host,
- kernel_boot_info_t boot_info);
-
-kern_return_t task_get_assignment(
- task_t task,
- processor_set_t *pset);
-
-kern_return_t
-thread_wire(
- host_t host,
- thread_t thread,
- boolean_t wired);
-
-kern_return_t thread_get_assignment(
- thread_t thread,
- processor_set_t *pset);
-
-/* End of RPCs */
-
-#endif /* _KERN_MACH_HOST_H */
diff --git a/kern/machine.c b/kern/machine.c
index cf8060d7..8da6ad66 100644
--- a/kern/machine.c
+++ b/kern/machine.c
@@ -45,7 +45,7 @@
#include <kern/ipc_host.h>
#include <kern/host.h>
#include <kern/machine.h>
-#include <kern/mach_host.h>
+#include <kern/mach_host.server.h>
#include <kern/lock.h>
#include <kern/processor.h>
#include <kern/queue.h>
diff --git a/kern/pc_sample.c b/kern/pc_sample.c
index d13beb07..9ac18821 100644
--- a/kern/pc_sample.c
+++ b/kern/pc_sample.c
@@ -35,7 +35,7 @@
#include <kern/host.h>
#include <kern/thread.h>
#include <kern/pc_sample.h>
-#include <kern/mach4.h>
+#include <kern/mach4.server.h>
#include <kern/mach_clock.h>
#if MACH_PCSAMPLE
@@ -159,7 +159,7 @@ get_sampled_pcs(
sample_control_t *cp,
sampled_pc_seqno_t *seqnop,
sampled_pc_array_t sampled_pcs_out,
- int *sampled_pcs_cntp)
+ mach_msg_type_number_t *sampled_pcs_cntp)
{
int nsamples;
sampled_pc_seqno_t seqidx1, seqidx2;
@@ -218,7 +218,7 @@ thread_get_sampled_pcs(
thread_t thread,
sampled_pc_seqno_t *seqnop,
sampled_pc_array_t sampled_pcs_out,
- int *sampled_pcs_cntp)
+ mach_msg_type_number_t *sampled_pcs_cntp)
{
if (thread == THREAD_NULL)
return KERN_INVALID_ARGUMENT;
@@ -235,7 +235,7 @@ task_get_sampled_pcs(
task_t task,
sampled_pc_seqno_t *seqnop,
sampled_pc_array_t sampled_pcs_out,
- int *sampled_pcs_cntp)
+ mach_msg_type_number_t *sampled_pcs_cntp)
{
if (task == TASK_NULL)
return KERN_INVALID_ARGUMENT;
diff --git a/kern/slab.c b/kern/slab.c
index d44da165..e26567fb 100644
--- a/kern/slab.c
+++ b/kern/slab.c
@@ -79,6 +79,7 @@
#include <kern/slab.h>
#include <kern/kalloc.h>
#include <kern/cpu_number.h>
+#include <kern/mach_debug.server.h>
#include <mach/vm_param.h>
#include <mach/machine/vm_types.h>
#include <vm/vm_kern.h>
diff --git a/kern/syscall_emulation.c b/kern/syscall_emulation.c
index 5a477006..50db1949 100644
--- a/kern/syscall_emulation.c
+++ b/kern/syscall_emulation.c
@@ -31,6 +31,7 @@
#include <kern/syscall_emulation.h>
#include <kern/task.h>
#include <kern/kalloc.h>
+#include <kern/mach.server.h>
#include <vm/vm_kern.h>
/* XXX */
diff --git a/kern/syscall_sw.c b/kern/syscall_sw.c
index f2163132..4249b711 100644
--- a/kern/syscall_sw.c
+++ b/kern/syscall_sw.c
@@ -38,7 +38,7 @@
#include <kern/syscall_subr.h>
#include <kern/ipc_mig.h>
#include <kern/eventcount.h>
-#include <ipc/mach_port.h>
+#include <ipc/mach_port.server.h>
/*
diff --git a/kern/task.c b/kern/task.c
index d5bd14c2..6bd50983 100644
--- a/kern/task.c
+++ b/kern/task.c
@@ -44,7 +44,10 @@
#include <kern/task.h>
#include <kern/thread.h>
#include <kern/slab.h>
+#include <kern/gnumach.server.h>
#include <kern/kalloc.h>
+#include <kern/mach.server.h>
+#include <kern/mach_host.server.h>
#include <kern/processor.h>
#include <kern/printf.h>
#include <kern/sched_prim.h> /* for thread_wakeup */
diff --git a/kern/thread.c b/kern/thread.c
index db290f7e..bc155b45 100644
--- a/kern/thread.c
+++ b/kern/thread.c
@@ -45,8 +45,8 @@
#include <kern/eventcount.h>
#include <kern/ipc_mig.h>
#include <kern/ipc_tt.h>
-#include <kern/mach_debug.h>
-#include <kern/mach_host.h>
+#include <kern/mach_debug.server.h>
+#include <kern/mach_host.server.h>
#include <kern/processor.h>
#include <kern/queue.h>
#include <kern/sched.h>
@@ -63,7 +63,7 @@
#include <ipc/ipc_kmsg.h>
#include <ipc/ipc_port.h>
#include <ipc/mach_msg.h>
-#include <ipc/mach_port.h>
+#include <ipc/mach_port.server.h>
#include <machine/machspl.h> /* for splsched */
#include <machine/pcb.h>
#include <machine/thread.h> /* for MACHINE_STACK */
diff --git a/vm/memory_object.c b/vm/memory_object.c
index 7f0d1d69..413795b7 100644
--- a/vm/memory_object.c
+++ b/vm/memory_object.c
@@ -61,6 +61,7 @@
#include <kern/debug.h> /* For panic() */
#include <kern/thread.h> /* For current_thread() */
#include <kern/host.h>
+#include <kern/mach.server.h> /* For rpc prototypes */
#include <vm/vm_kern.h> /* For kernel_map, vm_move */
#include <vm/vm_map.h> /* For vm_map_pageable */
#include <ipc/ipc_port.h>
@@ -85,7 +86,7 @@ decl_simple_lock_data(,memory_manager_default_lock)
kern_return_t memory_object_data_supply(
vm_object_t object,
vm_offset_t offset,
- vm_map_copy_t data_copy,
+ vm_offset_t vm_data_copy,
unsigned int data_cnt,
vm_prot_t lock_value,
boolean_t precious,
@@ -100,6 +101,7 @@ kern_return_t memory_object_data_supply(
vm_offset_t original_offset;
vm_page_t *page_list;
boolean_t was_absent;
+ vm_map_copy_t data_copy = (vm_map_copy_t)vm_data_copy;
vm_map_copy_t orig_copy = data_copy;
/*
diff --git a/vm/vm_debug.c b/vm/vm_debug.c
index 526bb163..cc483485 100644
--- a/vm/vm_debug.c
+++ b/vm/vm_debug.c
@@ -46,7 +46,7 @@
#include <vm/vm_map.h>
#include <vm/vm_kern.h>
#include <vm/vm_object.h>
-#include <kern/mach_debug.h>
+#include <kern/mach_debug.server.h>
#include <kern/task.h>
#include <kern/host.h>
#include <kern/printf.h>
diff --git a/vm/vm_map.c b/vm/vm_map.c
index b142ab9d..cabf47f8 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -43,6 +43,7 @@
#include <kern/assert.h>
#include <kern/debug.h>
#include <kern/kalloc.h>
+#include <kern/mach.server.h>
#include <kern/list.h>
#include <kern/rbtree.h>
#include <kern/slab.h>
diff --git a/vm/vm_object.c b/vm/vm_object.c
index 141bd094..16b34d4a 100644
--- a/vm/vm_object.c
+++ b/vm/vm_object.c
@@ -44,6 +44,7 @@
#include <ipc/ipc_space.h>
#include <kern/assert.h>
#include <kern/debug.h>
+#include <kern/mach.server.h>
#include <kern/lock.h>
#include <kern/queue.h>
#include <kern/xpr.h>
diff --git a/vm/vm_user.c b/vm/vm_user.c
index b3887ad1..df597267 100644
--- a/vm/vm_user.c
+++ b/vm/vm_user.c
@@ -40,9 +40,11 @@
#include <mach/vm_statistics.h>
#include <mach/vm_cache_statistics.h>
#include <mach/vm_sync.h>
+#include <kern/gnumach.server.h>
#include <kern/host.h>
-#include <kern/task.h>
#include <kern/mach.server.h>
+#include <kern/mach_host.server.h>
+#include <kern/task.h>
#include <vm/vm_fault.h>
#include <vm/vm_kern.h>
#include <vm/vm_map.h>
--
2.39.0
