xnu-6153.121.1.tar.gz

[apple/xnu.git] / osfmk / mach / mach_vm.defs

diff --git a/osfmk/mach/mach_vm.defs b/osfmk/mach/mach_vm.defs
index e0c7828e6c70371c86b45e6904e54730aa76d123..88097761f017b5d686ad2187d5ed0008dac86968 100644 (file)
--- a/osfmk/mach/mach_vm.defs
+++ b/osfmk/mach/mach_vm.defs
@@ -76,12 +76,19 @@ subsystem
 #include <mach/mach_types.defs>
 #include <mach_debug/mach_debug_types.defs>
 
 #include <mach/mach_types.defs>
 #include <mach_debug/mach_debug_types.defs>
 

+#define CONCAT(a,b) a ## b

 #if !KERNEL && !LIBSYSCALL_INTERFACE
 #if !KERNEL && !LIBSYSCALL_INTERFACE

-#define PREFIX(NAME) _kernelrpc_ ## NAME
+#define PREFIX(NAME) CONCAT(_kernelrpc_, NAME)

 #else
 #define PREFIX(NAME) NAME
 #endif
 
 #else
 #define PREFIX(NAME) NAME
 #endif
 

+#if    KERNEL_SERVER
+#define KERNEL_SERVER_SUFFIX(NAME) CONCAT(NAME, _external)
+#else
+#define KERNEL_SERVER_SUFFIX(NAME) NAME
+#endif
+

 /*
  *     Allocate zero-filled memory in the address space
  *     of the target task, either at the specified address,
 /*
  *     Allocate zero-filled memory in the address space
  *     of the target task, either at the specified address,


@@ -90,7 +97,7 @@ subsystem
  *     allocation actually took place is returned.
  */
 #if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
  *     allocation actually took place is returned.
  */
 #if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)

-routine PREFIX(mach_vm_allocate) (
+routine PREFIX(KERNEL_SERVER_SUFFIX(mach_vm_allocate)) (

                target          : vm_task_entry_t;
        inout   address         : mach_vm_address_t;
                size            : mach_vm_size_t;
                target          : vm_task_entry_t;
        inout   address         : mach_vm_address_t;
                size            : mach_vm_size_t;


@@ -101,7 +108,7 @@ routine PREFIX(mach_vm_allocate) (
 #if !KERNEL && !LIBSYSCALL_INTERFACE
 skip;
 #else
 #if !KERNEL && !LIBSYSCALL_INTERFACE
 skip;
 #else

-routine PREFIX(vm_allocate) (
+routine PREFIX(KERNEL_SERVER_SUFFIX(vm_allocate)) (

                target          : vm_task_entry_t;
        inout   address         : mach_vm_address_t;
                size            : mach_vm_size_t;
                target          : vm_task_entry_t;
        inout   address         : mach_vm_address_t;
                size            : mach_vm_size_t;


@@ -333,12 +340,12 @@ routine vm_behavior_set(
  *     for further consistency.]
  */
 #if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
  *     for further consistency.]
  */
 #if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)

-routine PREFIX(mach_vm_map) (
+routine PREFIX(KERNEL_SERVER_SUFFIX(mach_vm_map)) (

 #else
 #if defined(__arm__) && !LIBSYSCALL_INTERFACE
 routine _vm_map_arm(
 #else
 #else
 #if defined(__arm__) && !LIBSYSCALL_INTERFACE
 routine _vm_map_arm(
 #else

-routine PREFIX(vm_map) (
+routine PREFIX(KERNEL_SERVER_SUFFIX(vm_map)) (

 #endif
 #endif
                target_task     : vm_task_entry_t;
 #endif
 #endif
                target_task     : vm_task_entry_t;


@@ -373,9 +380,9 @@ routine vm_machine_attribute(
  *      Map portion of a task's address space.
  */
 #if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
  *      Map portion of a task's address space.
  */
 #if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)

-routine PREFIX(mach_vm_remap) (
+routine PREFIX(KERNEL_SERVER_SUFFIX(mach_vm_remap)) (

 #else
 #else

-routine PREFIX(vm_remap) (
+routine PREFIX(KERNEL_SERVER_SUFFIX(vm_remap)) (

 #endif
                target_task     : vm_map_t;
        inout   target_address  : mach_vm_address_t;
 #endif
                target_task     : vm_map_t;
        inout   target_address  : mach_vm_address_t;


@@ -492,6 +499,17 @@ routine mach_vm_page_info(
 skip;
 #endif
 
 skip;
 #endif
 

+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_page_range_query(
+                target_map             : vm_map_t;
+                address                        : mach_vm_offset_t;
+                size                   : mach_vm_size_t;
+                dispositions           : mach_vm_address_t;
+       inout   dispositions_count      : mach_vm_size_t);
+#else
+skip;
+#endif
+

 /****************************** Legacy section ***************************/
 /*  The following definitions are exist to provide compatibility with    */
 /*  the legacy APIs.  They are no different.  We just need to produce    */
 /****************************** Legacy section ***************************/
 /*  The following definitions are exist to provide compatibility with    */
 /*  the legacy APIs.  They are no different.  We just need to produce    */