xnu-4903.221.2.tar.gz

[apple/xnu.git] / bsd / sys / param.h

diff --git a/bsd/sys/param.h b/bsd/sys/param.h
index ae6b275de61ab0d01a318ee03fc44d6b6beb3c71..012e7563095c58324ad5d19b158fb4e5e0352878 100644 (file)
--- a/bsd/sys/param.h
+++ b/bsd/sys/param.h
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @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
@@ -18,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@
  */
 /* Copyright (c) 1995, 1997 Apple Computer, Inc. All Rights Reserved */
 /*-
@@ -72,10 +77,7 @@
 #define NeXTBSD4_0 0           /* NeXTBSD 4.0 */
 
 #include <sys/_types.h>
-
-#ifndef NULL
-#define        NULL    __DARWIN_NULL
-#endif /* ! NULL */
+#include <sys/_types/_null.h>
 
 #ifndef LOCORE
 #include <sys/types.h>
@@ -140,9 +142,8 @@
 #define        PRIMASK 0x0ff
 #define        PCATCH  0x100           /* OR'd with pri for tsleep to check signals */
 #define PTTYBLOCK 0x200                /* for tty SIGTTOU and SIGTTIN blocking */
-#define PDROP  0x400           /* OR'd with pri to stop re-entry of interlock mutex */
-
-#define        NZERO   0               /* default "nice" */
+#define PDROP  0x400           /* OR'd with pri to stop re-aquistion of mutex upon wakeup */
+#define PSPIN  0x800           /* OR'd with pri to require mutex in spin mode upon wakeup */
 
 #define        NBPW    sizeof(int)     /* number of bytes per word (integer) */
 
@@ -184,7 +185,7 @@
  * primarily determines the size of buffers in the buffer pool.  It may be
  * made larger than MAXPHYS without any effect on existing file systems;
  * however making it smaller may make some file systems unmountable.
- * We set this to track the value of (MAX_UPL_TRANSFER*PAGE_SIZE) from
+ * We set this to track the value of MAX_UPL_TRANSFER_BYTES from
  * osfmk/mach/memory_object_types.h to bound it at the maximum UPL size.
  */
 #define        MAXBSIZE        (256 * 4096)
@@ -213,9 +214,10 @@
 
 /* Macros for counting and rounding. */
 #ifndef howmany
-#define        howmany(x, y)   (((x)+((y)-1))/(y))
+#define        howmany(x, y)   ((((x) % (y)) == 0) ? ((x) / (y)) : (((x) / (y)) + 1))
 #endif
-#define        roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
+#define        roundup(x, y)   ((((x) % (y)) == 0) ? \
+                       (x) : ((x) + ((y) - ((x) % (y)))))
 #define powerof2(x)    ((((x)-1)&(x))==0)
 
 /* Macros for min/max. */