From: Kirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Date: Thu, 10 May 1990 02:04:36 +0000 (-0800)
Subject: update for hp300 merge
X-Git-Tag: BSD-4_3_Reno-Snapshot-Development~3199
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/e08136320c23de0bd0da2c1e2a2d8ccf2181b7d2

update for hp300 merge

SCCS-vsn: sys/sys/malloc.h 7.15
---

diff --git a/usr/src/sys/sys/malloc.h b/usr/src/sys/sys/malloc.h
index 3721cbbb21..418268d7db 100644
--- a/usr/src/sys/sys/malloc.h
+++ b/usr/src/sys/sys/malloc.h
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)malloc.h	7.14 (Berkeley) %G%
+ *	@(#)malloc.h	7.15 (Berkeley) %G%
  */
 
 #define KMEMSTATS
@@ -56,6 +56,8 @@
 #define	M_CACHE		25	/* Dynamically allocated cache entries */
 #define	M_DQUOT		26	/* UFS quota entries */
 #define	M_UFSMNT	27	/* UFS mount structure */
+#define	M_MAPMEM	28	/* mapped memory descriptors */
+#define	M_SHM		29	/* SVID compatible shared memory segments */
 #define M_TEMP		49	/* misc temporary data buffers */
 #define M_LAST		50