summaryrefslogtreecommitdiff
path: root/vm
diff options
context:
space:
mode:
authorFlavio Cruz <flaviocruz@gmail.com>2023-01-17 23:56:04 -0500
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-01-19 00:55:04 +0100
commit2029728ed6d2a88350be945a892d325aebc2eb8d (patch)
tree5cdae89a531f8d10e08b39491c7c8e64cff3f9b0 /vm
parentfc6bcf785b702e7e8a675ea0fe9856cc1b24b8f6 (diff)
Include mig generated headers to avoid warnings with -Wmissing-prototypes.
This also reverts 566c227636481b246d928772ebeaacbc7c37145b and 963b1794d7117064cee8ab5638b329db51dad854 Message-Id: <Y8d75KSqNL4FFInm@mercury.tail36e24.ts.net>
Diffstat (limited to 'vm')
-rw-r--r--vm/memory_object.c4
-rw-r--r--vm/vm_debug.c2
-rw-r--r--vm/vm_map.c1
-rw-r--r--vm/vm_object.c1
-rw-r--r--vm/vm_user.c4
5 files changed, 9 insertions, 3 deletions
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>