xnu-517.3.15.tar.gz

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

diff --git a/bsd/sys/malloc.h b/bsd/sys/malloc.h
index b4fb2b2ee6aa908600da0a62c3ea001070f378ab..763e84c9e1d073a710bbe641e70aa027713b0571 100644 (file)
--- a/bsd/sys/malloc.h
+++ b/bsd/sys/malloc.h
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 
+ * 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@
  */
@@ -68,6 +71,7 @@
  */
 #define        M_WAITOK        0x0000
 #define        M_NOWAIT        0x0001
+#define M_ZERO          0x0004          /* bzero the allocation */
 
 /*
  * Types of memory to be allocated (not all are used by us)
@@ -166,8 +170,10 @@
 #define M_IGMP         90
 #define M_JNL_JNL   91  /* Journaling: "struct journal" */
 #define M_JNL_TR    92  /* Journaling: "struct transaction" */ 
+#define        M_SPECINFO      93      /* special file node */
+#define M_KQUEUE       94      /* kqueue */
 
-#define        M_LAST          93      /* Must be last type + 1 */
+#define        M_LAST          95      /* Must be last type + 1 */
 
 /* Strings corresponding to types of memory */
 /* Must be in synch with the #defines above */
@@ -264,7 +270,9 @@
        "TCP Segment Q",/* 89 M_TSEGQ */\
        "IGMP state",   /* 90 M_IGMP */\
        "Journal",    /* 91 M_JNL_JNL */\
-       "Transaction"    /* 92 M_JNL_TR */\
+       "Transaction",    /* 92 M_JNL_TR */\
+       "specinfo",             /* 93 M_SPECINFO */\
+       "kqueue"                /* 94 M_KQUEUE */\
 }
 
 struct kmemstats {