xnu-1699.26.8.tar.gz

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

diff --git a/bsd/sys/param.h b/bsd/sys/param.h
index 920c744a2bdbb6668b410aed4c7cbeb9abf52a3d..93f92615081e0f7ebf29933acbefb0d8926eb610 100644 (file)
--- a/bsd/sys/param.h
+++ b/bsd/sys/param.h
@@ -145,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) */
 


@@ -218,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)