xnu-1228.tar.gz

[apple/xnu.git] / osfmk / default_pager / default_pager_internal.h

diff --git a/osfmk/default_pager/default_pager_internal.h b/osfmk/default_pager/default_pager_internal.h
index b01a94cae8abf1fcb0397c02927ee0766e405236..0d9fb9c9ae97a57d4e883c91c970406d488558e9 100644 (file)
--- a/osfmk/default_pager/default_pager_internal.h
+++ b/osfmk/default_pager/default_pager_internal.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 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@
@@ -156,8 +162,8 @@ extern int  debug_mask;
 
 #else  /* DEFAULT_PAGER_DEBUG */
 
-#define DP_DEBUG(level, args)
-#define ASSERT(clause)
+#define DP_DEBUG(level, args) do {} while(0)
+#define ASSERT(clause) do {} while(0)
 
 #endif /* DEFAULT_PAGER_DEBUG */
 
@@ -165,8 +171,6 @@ extern int  debug_mask;
 extern char *mach_error_string(kern_return_t);
 #endif
 
-#define MIN(a,b)       (((a) < (b)) ? (a) : (b))
-
 #define        PAGER_SUCCESS   0
 #define        PAGER_FULL      1
 #define        PAGER_ERROR     2
@@ -590,7 +594,7 @@ typedef struct vstruct {
        unsigned int            vs_writers;     /* Writes in progress */
 
 #ifdef MACH_KERNEL
-       int
+       unsigned int
        /* boolean_t */         vs_waiting_seqno:1,     /* to wait on seqno */
        /* boolean_t */         vs_waiting_read:1,      /* waiting on reader? */
        /* boolean_t */         vs_waiting_write:1,     /* waiting on writer? */
@@ -791,8 +795,9 @@ extern boolean_t    bs_add_device(char *,
 extern vstruct_t       ps_vstruct_create(vm_size_t);
 extern void            ps_vstruct_dealloc(vstruct_t);
 extern kern_return_t   pvs_cluster_read(vstruct_t,
-                                       vm_offset_t,
-                                       vm_size_t);
+                                        vm_offset_t,
+                                        vm_size_t,
+                                        void *);
 extern kern_return_t   vs_cluster_write(vstruct_t,
                                         upl_t,
                                         upl_offset_t,