xnu-6153.121.1.tar.gz

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

diff --git a/osfmk/mach/vm_map.defs b/osfmk/mach/vm_map.defs
index 521d5886edfd2b23ba193b87d1f337def7e907e4..7caa92639bf8e55eb53620aa1f0ee6082c571bb4 100644 (file)
--- a/osfmk/mach/vm_map.defs
+++ b/osfmk/mach/vm_map.defs
@@ -71,12 +71,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
+

 /*
  *      Returns information about the contents of the virtual
  *      address space of the target task at the specified
 /*
  *      Returns information about the contents of the virtual
  *      address space of the target task at the specified


@@ -109,7 +116,7 @@ routine vm_region(
 #if !KERNEL && !LIBSYSCALL_INTERFACE
 skip;
 #else
 #if !KERNEL && !LIBSYSCALL_INTERFACE
 skip;
 #else

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

                target_task     : vm_task_entry_t;
        inout   address         : vm_address_t;
                size            : vm_size_t;
                target_task     : vm_task_entry_t;
        inout   address         : vm_address_t;
                size            : vm_size_t;


@@ -174,7 +181,7 @@ routine vm_inherit(
  *     and must be a multiple of pages in extent.  The
  *     protection on the specified range must permit reading.]
  */
  *     and must be a multiple of pages in extent.  The
  *     protection on the specified range must permit reading.]
  */

-routine vm_read(
+routine PREFIX(vm_read) (

                target_task     : vm_map_t;
                address         : vm_address_t;
                size            : vm_size_t;
                target_task     : vm_map_t;
                address         : vm_address_t;
                size            : vm_size_t;


@@ -283,7 +290,7 @@ routine vm_behavior_set(
  *     The user-defined memory manager for this object is responsible
  *     for further consistency.]
  */
  *     The user-defined memory manager for this object is responsible
  *     for further consistency.]
  */

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

                target_task     : vm_task_entry_t;
        inout   address         : vm_address_t;
                size            : vm_size_t;
                target_task     : vm_task_entry_t;
        inout   address         : vm_address_t;
                size            : vm_size_t;


@@ -311,7 +318,7 @@ routine vm_machine_attribute(
 /*
  *      Map portion of a task's address space.
  */
 /*
  *      Map portion of a task's address space.
  */

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

                target_task     : vm_map_t;
        inout   target_address  : vm_address_t;
                size            : vm_size_t;
                target_task     : vm_map_t;
        inout   target_address  : vm_address_t;
                size            : vm_size_t;


@@ -442,7 +449,7 @@ routine mach_make_memory_entry_64(
 
 
 
 
 
 

-routine vm_map_64(
+routine KERNEL_SERVER_SUFFIX(vm_map_64)(

                target_task     : vm_task_entry_t;
        inout   address         : vm_address_t;
                size            : vm_size_t;
                target_task     : vm_task_entry_t;
        inout   address         : vm_address_t;
                size            : vm_size_t;


@@ -489,10 +496,15 @@ skip; /* was vm_upl_unmap */
  *     specified.  See the routine implementation for a complete
  *     definition of the routine.
  */
  *     specified.  See the routine implementation for a complete
  *     definition of the routine.
  */

-routine vm_purgable_control(
+routine PREFIX(vm_purgable_control) (

                target_task     : vm_map_t;
                address         : vm_address_t;
                control         : vm_purgable_t;
        inout   state           : int);
 
                target_task     : vm_map_t;
                address         : vm_address_t;
                control         : vm_purgable_t;
        inout   state           : int);
 

+
+routine vm_map_exec_lockdown(
+               target_task     : vm_map_t);
+
+

 /* vim: set ft=c : */
 /* vim: set ft=c : */