X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..fe8ab488e9161c46dd9885d58fc52996dc0249ff:/bsd/sys/param.h

diff --git a/bsd/sys/param.h b/bsd/sys/param.h
index f655358eb..012e75630 100644
--- a/bsd/sys/param.h
+++ b/bsd/sys/param.h
@@ -77,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>
@@ -145,7 +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 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) */
 
@@ -187,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)
@@ -216,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. */