xnu-7195.101.1.tar.gz

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

diff --git a/osfmk/mach/memory_object_control.defs b/osfmk/mach/memory_object_control.defs
index 22a6518c095ce3029e1b75e9fa3b7ac0592f0cde..0ba43bee39c0d6d7cd5413ee2920b86c18d8bac0 100644 (file)
--- a/osfmk/mach/memory_object_control.defs
+++ b/osfmk/mach/memory_object_control.defs
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -65,10 +71,6 @@ subsystem
 #endif /* KERNEL_SERVER */
                     memory_object_control 2000;
 
-#ifdef MACH_KERNEL
-#include <advisory_pageout.h>
-#endif /* MACH_KERNEL */
-
 #include <mach/std_types.defs>
 #include <mach/mach_types.defs>
 
@@ -91,7 +93,7 @@ routine memory_object_change_attributes(
 routine memory_object_synchronize_completed (
                memory_control  : memory_object_control_t;
                offset          : memory_object_offset_t;
-               length          : vm_offset_t);
+               length          : memory_object_size_t);
 
 /*
  *     Control use of the data associated with the given
@@ -142,19 +144,29 @@ routine memory_object_destroy(
 routine memory_object_upl_request(
                memory_control  : memory_object_control_t;
        in      offset          : memory_object_offset_t;
-       in      size            : vm_size_t;
+       in      size            : upl_size_t;
        out     upl             : upl_t;
        out     page_list       : upl_page_info_array_t, CountInOut;
-       in      cntrl_flags     : integer_t);
+       in      cntrl_flags     : integer_t;
+       in  tag         : integer_t);
 
 routine memory_object_super_upl_request(
                memory_control          : memory_object_control_t;
        in      offset          : memory_object_offset_t;
-       in      size            : vm_size_t;
-       in      super_size      : vm_size_t;
+       in      size            : upl_size_t;
+       in      super_size      : upl_size_t;
        out     upl             : upl_t;
        out     page_list       : upl_page_info_array_t, CountInOut;
-       in      cntrl_flags     : integer_t);
+       in      cntrl_flags     : integer_t;
+       in  tag         : integer_t);
+
+
+routine memory_object_cluster_size(
+               control         : memory_object_control_t;
+       out     start           : memory_object_offset_t;
+       out     length          : vm_size_t;
+       out     io_streaming    : uint32_t;
+       in      fault_info      : memory_object_fault_info_t);
 
 /*
  * This functions allows a single page to be manipulated with less overhead
@@ -182,4 +194,4 @@ routine memory_object_range_op(
        in      ops             : integer_t;
        out     range           : integer_t);
 
-
+/* vim: set ft=c : */