X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d7e50217d7adf6e52786a38bcaa4cd698cb9a79e..ea3f04195ba4a5034c9c8e9b726d4f7ce96f1832:/osfmk/mach/upl.defs

diff --git a/osfmk/mach/upl.defs b/osfmk/mach/upl.defs
index b10e5a2a1..5aceb99a4 100644
--- a/osfmk/mach/upl.defs
+++ b/osfmk/mach/upl.defs
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
+ * 
+ * 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
@@ -20,7 +23,7 @@
  * 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@
@@ -62,16 +65,12 @@
 subsystem
 #if	KERNEL_USER
 	  KernelUser
-#endif	KERNEL_USER
+#endif	/* KERNEL_USER */
 #if	KERNEL_SERVER
 	  KernelServer
-#endif	KERNEL_SERVER
+#endif	/* KERNEL_SERVER */
 		     upl 2050;
 
-#ifdef	MACH_KERNEL
-#include <advisory_pageout.h>
-#endif	/* MACH_KERNEL */
-
 #include <mach/std_types.defs>
 #include <mach/mach_types.defs>
 
@@ -81,10 +80,10 @@ routine upl_abort(
 
 routine upl_abort_range(
 		upl_object	: upl_t;
-		offset		: vm_offset_t;
-		size		: vm_size_t;
+		offset		: upl_offset_t;
+		size		: upl_size_t;
 	in	abort_cond	: integer_t;
-	out	empty	: boolean_t);
+	out	empty		: boolean_t);
  
 routine upl_commit(
 		upl_object	: upl_t;
@@ -92,9 +91,10 @@ routine upl_commit(
 
 routine upl_commit_range(
 		upl_object	: upl_t;
-		offset		: vm_offset_t;
-		size		: vm_size_t;
+		offset		: upl_offset_t;
+		size		: upl_size_t;
 	in	cntrl_flags	: integer_t;
 	in	page_list	: upl_page_info_array_t;
-	out	empty	: boolean_t);
+	out	empty		: boolean_t);
 
+/* vim: set ft=c : */