xnu-1699.22.81.tar.gz

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

diff --git a/bsd/sys/param.h b/bsd/sys/param.h
index ae6b275de61ab0d01a318ee03fc44d6b6beb3c71..93f92615081e0f7ebf29933acbefb0d8926eb610 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.
  *
 /*
  * 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
  * 
  * 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
  * 
  * 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.
  * 
  * 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 */
 /*-
  */
 /* Copyright (c) 1995, 1997 Apple Computer, Inc. All Rights Reserved */
 /*-


@@ -140,9 +145,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        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) */
 
 
 #define        NBPW    sizeof(int)     /* number of bytes per word (integer) */
 


@@ -213,7 +217,7 @@
 
 /* Macros for counting and rounding. */
 #ifndef howmany
 
 /* 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 powerof2(x)    ((((x)-1)&(x))==0)
 #endif
 #define        roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
 #define powerof2(x)    ((((x)-1)&(x))==0)