xnu-4570.71.2.tar.gz

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

diff --git a/bsd/sys/malloc.h b/bsd/sys/malloc.h
index b4fb2b2ee6aa908600da0a62c3ea001070f378ab..0dd7117f5b8fce73129d737ca72821c4e51804b4 100644 (file)
--- a/bsd/sys/malloc.h
+++ b/bsd/sys/malloc.h
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2013 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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. 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
  * 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@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /* Copyright (c) 1998, 1999 Apple Computer, Inc. All Rights Reserved */
 /* Copyright (c) 1995, 1997 Apple Computer, Inc. All Rights Reserved */
  */
 /* Copyright (c) 1998, 1999 Apple Computer, Inc. All Rights Reserved */
 /* Copyright (c) 1995, 1997 Apple Computer, Inc. All Rights Reserved */


@@ -55,19 +61,31 @@
  *
  *     @(#)malloc.h    8.5 (Berkeley) 5/3/95
  */
  *
  *     @(#)malloc.h    8.5 (Berkeley) 5/3/95
  */

+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */

 
 #ifndef _SYS_MALLOC_H_
 #define        _SYS_MALLOC_H_
 
 #include <sys/appleapiopts.h>
 
 
 #ifndef _SYS_MALLOC_H_
 #define        _SYS_MALLOC_H_
 
 #include <sys/appleapiopts.h>
 

-#define KMEMSTATS

 
 

+#ifdef KERNEL

 /*
  * flags to malloc
  */
 #define        M_WAITOK        0x0000
 #define        M_NOWAIT        0x0001
 /*
  * flags to malloc
  */
 #define        M_WAITOK        0x0000
 #define        M_NOWAIT        0x0001

+#define M_ZERO          0x0004          /* bzero the allocation */
+#define M_NULL         0x0008          /* return NULL if space is unavailable*/
+
+#ifdef BSD_KERNEL_PRIVATE
+
+#define KMEMSTATS 0

 
 /*
  * Types of memory to be allocated (not all are used by us)
 
 /*
  * Types of memory to be allocated (not all are used by us)


@@ -91,7 +109,7 @@
 #define        M_CRED          16      /* credentials */
 #define        M_PGRP          17      /* process group header */
 #define        M_SESSION       18      /* session header */
 #define        M_CRED          16      /* credentials */
 #define        M_PGRP          17      /* process group header */
 #define        M_SESSION       18      /* session header */

-#define        M_IOV           19      /* large iov's */
+#define        M_IOV32         19      /* large iov's for 32 bit process */

 #define        M_MOUNT         20      /* vfs mount struct */
 #define        M_FHANDLE       21      /* network file handle */
 #define        M_NFSREQ        22      /* NFS request header */
 #define        M_MOUNT         20      /* vfs mount struct */
 #define        M_FHANDLE       21      /* network file handle */
 #define        M_NFSREQ        22      /* NFS request header */


@@ -100,31 +118,31 @@
 #define        M_VNODE         25      /* Dynamically allocated vnodes */
 #define        M_CACHE         26      /* Dynamically allocated cache entries */
 #define        M_DQUOT         27      /* UFS quota entries */
 #define        M_VNODE         25      /* Dynamically allocated vnodes */
 #define        M_CACHE         26      /* Dynamically allocated cache entries */
 #define        M_DQUOT         27      /* UFS quota entries */

-#define        M_UFSMNT        28      /* UFS mount structure */
+#define        M_PROC_UUID_POLICY      28      /* proc UUID policy entries */

 #define        M_SHM           29      /* SVID compatible shared memory segments */
 #define        M_SHM           29      /* SVID compatible shared memory segments */

-#define        M_VMMAP         30      /* VM map structures */
-#define        M_VMMAPENT      31      /* VM map entry structures */
+#define        M_PLIMIT        30      /* plimit  structures */
+#define        M_SIGACTS       31      /* sigacts structures */

 #define        M_VMOBJ         32      /* VM object structure */
 #define        M_VMOBJHASH     33      /* VM object hash structure */
 #define        M_VMPMAP        34      /* VM pmap */
 #define        M_VMPVENT       35      /* VM phys-virt mapping entry */
 #define        M_VMPAGER       36      /* XXX: VM pager struct */
 #define        M_VMPGDATA      37      /* XXX: VM pager private data */
 #define        M_VMOBJ         32      /* VM object structure */
 #define        M_VMOBJHASH     33      /* VM object hash structure */
 #define        M_VMPMAP        34      /* VM pmap */
 #define        M_VMPVENT       35      /* VM phys-virt mapping entry */
 #define        M_VMPAGER       36      /* XXX: VM pager struct */
 #define        M_VMPGDATA      37      /* XXX: VM pager private data */

-#define        M_FILE          38      /* Open file structure */
+#define        M_FILEPROC      38      /* Open file structure */

 #define        M_FILEDESC      39      /* Open file descriptor table */
 #define        M_LOCKF         40      /* Byte-range locking structures */
 #define        M_PROC          41      /* Proc structures */
 #define        M_FILEDESC      39      /* Open file descriptor table */
 #define        M_LOCKF         40      /* Byte-range locking structures */
 #define        M_PROC          41      /* Proc structures */

-#define        M_SUBPROC       42      /* Proc sub-structures */
+#define        M_PSTATS        42      /* pstats  proc sub-structures */

 #define        M_SEGMENT       43      /* Segment for LFS */
 #define        M_LFSNODE       44      /* LFS vnode private part */
 #define        M_FFSNODE       45      /* FFS vnode private part */
 #define        M_MFSNODE       46      /* MFS vnode private part */
 #define        M_SEGMENT       43      /* Segment for LFS */
 #define        M_LFSNODE       44      /* LFS vnode private part */
 #define        M_FFSNODE       45      /* FFS vnode private part */
 #define        M_MFSNODE       46      /* MFS vnode private part */

-#define        M_NQLEASE       47      /* Nqnfs lease */
-#define        M_NQMHOST       48      /* Nqnfs host address table */
+#define        M_NQLEASE       47      /* XXX: Nqnfs lease */
+#define        M_NQMHOST       48      /* XXX: Nqnfs host address table */

 #define        M_NETADDR       49      /* Export host address structure */
 #define        M_NETADDR       49      /* Export host address structure */

-#define        M_NFSSVC        50      /* Nfs server structure */
-#define        M_NFSUID        51      /* Nfs uid mapping structure */
-#define        M_NFSD          52      /* Nfs server daemon structure */
+#define        M_NFSSVC        50      /* NFS server structure */
+#define        M_NFSUID        51      /* XXX: NFS uid mapping structure */
+#define        M_NFSD          52      /* NFS server daemon structure */

 #define        M_IPMOPTS       53      /* internet multicast options */
 #define        M_IPMADDR       54      /* internet multicast address */
 #define        M_IFMADDR       55      /* link-level multicast address */
 #define        M_IPMOPTS       53      /* internet multicast options */
 #define        M_IPMADDR       54      /* internet multicast address */
 #define        M_IFMADDR       55      /* link-level multicast address */


@@ -147,13 +165,12 @@
 #define        M_BUFHDR        72      /* File buffer cache headers */
 #define        M_OFILETABL     73      /* Open file descriptor table */
 #define        M_MCLUST        74      /* mbuf cluster buffers */
 #define        M_BUFHDR        72      /* File buffer cache headers */
 #define        M_OFILETABL     73      /* Open file descriptor table */
 #define        M_MCLUST        74      /* mbuf cluster buffers */

-#define        M_HFSMNT        75      /* HFS mount structure */
-#define        M_HFSNODE       76      /* HFS catalog node */
-#define        M_HFSFORK       77      /* HFS file fork */
-#define M_VOLFSMNT     78  /* VOLFS mount structure */
-#define        M_VOLFSNODE     79      /* VOLFS private node part */
+/* unused      75 */
+/* unused      76 */
+/* unused      77 */
+/* unused      78 */
+/* unused      79 */

 #define        M_TEMP          80      /* misc temporary data buffers */
 #define        M_TEMP          80      /* misc temporary data buffers */

-#define        M_KTRACE        M_TEMP  /* ktrace buffers */

 #define        M_SECA          81      /* security associations, key management */
 #define M_DEVFS                82
 #define M_IPFW         83      /* IP Forwarding/NAT */
 #define        M_SECA          81      /* security associations, key management */
 #define M_DEVFS                82
 #define M_IPFW         83      /* IP Forwarding/NAT */


@@ -162,111 +179,67 @@
 #define M_IP6NDP       86      /* IPv6 Neighbour Discovery*/
 #define M_IP6OPT       87      /* IPv6 options management */
 #define M_IP6MISC      88      /* IPv6 misc. memory */
 #define M_IP6NDP       86      /* IPv6 Neighbour Discovery*/
 #define M_IP6OPT       87      /* IPv6 options management */
 #define M_IP6MISC      88      /* IPv6 misc. memory */

-#define M_TSEGQ                89      /* TCP segment queue entry */
+/* unused      89 */

 #define M_IGMP         90
 #define M_IGMP         90

-#define M_JNL_JNL   91  /* Journaling: "struct journal" */
-#define M_JNL_TR    92  /* Journaling: "struct transaction" */ 
-
-#define        M_LAST          93      /* Must be last type + 1 */
-
-/* Strings corresponding to types of memory */
-/* Must be in synch with the #defines above */
-#define        INITKMEMNAMES { \
-       "free",         /* 0 M_FREE */ \
-       "mbuf",         /* 1 M_MBUF */ \
-       "devbuf",       /* 2 M_DEVBUF */ \
-       "socket",       /* 3 M_SOCKET */ \
-       "pcb",          /* 4 M_PCB */ \
-       "routetbl",     /* 5 M_RTABLE */ \
-       "hosttbl",      /* 6 M_HTABLE */ \
-       "fragtbl",      /* 7 M_FTABLE */ \
-       "zombie",       /* 8 M_ZOMBIE */ \
-       "ifaddr",       /* 9 M_IFADDR */ \
-       "soopts",       /* 10 M_SOOPTS */ \
-       "soname",       /* 11 M_SONAME */ \
-       "namei",        /* 12 M_NAMEI */ \
-       "gprof",        /* 13 M_GPROF */ \
-       "ioctlops",     /* 14 M_IOCTLOPS */ \
-       "mapmem",       /* 15 M_MAPMEM */ \
-       "cred",         /* 16 M_CRED */ \
-       "pgrp",         /* 17 M_PGRP */ \
-       "session",      /* 18 M_SESSION */ \
-       "iov",          /* 19 M_IOV */ \
-       "mount",        /* 20 M_MOUNT */ \
-       "fhandle",      /* 21 M_FHANDLE */ \
-       "NFS req",      /* 22 M_NFSREQ */ \
-       "NFS mount",    /* 23 M_NFSMNT */ \
-       "NFS node",     /* 24 M_NFSNODE */ \
-       "vnodes",       /* 25 M_VNODE */ \
-       "namecache",    /* 26 M_CACHE */ \
-       "UFS quota",    /* 27 M_DQUOT */ \
-       "UFS mount",    /* 28 M_UFSMNT */ \
-       "shm",          /* 29 M_SHM */ \
-       "VM map",       /* 30 M_VMMAP */ \
-       "VM mapent",    /* 31 M_VMMAPENT */ \
-       "VM object",    /* 32 M_VMOBJ */ \
-       "VM objhash",   /* 33 M_VMOBJHASH */ \
-       "VM pmap",      /* 34 M_VMPMAP */ \
-       "VM pvmap",     /* 35 M_VMPVENT */ \
-       "VM pager",     /* 36 M_VMPAGER */ \
-       "VM pgdata",    /* 37 M_VMPGDATA */ \
-       "file",         /* 38 M_FILE */ \
-       "file desc",    /* 39 M_FILEDESC */ \
-       "lockf",        /* 40 M_LOCKF */ \
-       "proc",         /* 41 M_PROC */ \
-       "subproc",      /* 42 M_SUBPROC */ \
-       "LFS segment",  /* 43 M_SEGMENT */ \
-       "LFS node",     /* 44 M_LFSNODE */ \
-       "FFS node",     /* 45 M_FFSNODE */ \
-       "MFS node",     /* 46 M_MFSNODE */ \
-       "NQNFS Lease",  /* 47 M_NQLEASE */ \
-       "NQNFS Host",   /* 48 M_NQMHOST */ \
-       "Export Host",  /* 49 M_NETADDR */ \
-       "NFS srvsock",  /* 50 M_NFSSVC */ \
-       "NFS uid",      /* 51 M_NFSUID */ \
-       "NFS daemon",   /* 52 M_NFSD */ \
-       "ip_moptions",  /* 53 M_IPMOPTS */ \
-       "in_multi",     /* 54 M_IPMADDR */ \
-       "ether_multi",  /* 55 M_IFMADDR */ \
-       "mrt",          /* 56 M_MRTABLE */ \
-       "ISOFS mount",  /* 57 M_ISOFSMNT */ \
-       "ISOFS node",   /* 58 M_ISOFSNODE */ \
-       "NFSV3 srvdesc",/* 59 M_NFSRVDESC */ \
-       "NFSV3 diroff", /* 60 M_NFSDIROFF */ \
-       "NFSV3 bigfh",  /* 61 M_NFSBIGFH */ \
-       "MSDOSFS mount",/* 62 M_MSDOSFSMNT */ \
-       "MSDOSFS fat",  /* 63 M_MSDOSFSFAT */ \
-       "MSDOSFS node", /* 64 M_MSDOSFSNODE */ \
-       "ttys",         /* 65 M_TTYS */ \
-       "exec",         /* 66 M_EXEC */ \
-       "miscfs mount", /* 67 M_MISCFSMNT */ \
-       "miscfs node",  /* 68 M_MISCFSNODE */ \
-       "adosfs mount", /* 69 M_ADOSFSMNT */ \
-       "adosfs node",  /* 70 M_ADOSFSNODE */ \
-       "adosfs anode", /* 71 M_ANODE */ \
-       "buf hdrs",     /* 72 M_BUFHDR */ \
-       "ofile tabl",   /* 73 M_OFILETABL */ \
-       "mbuf clust",   /* 74 M_MCLUST */ \
-       "HFS mount",    /* 75 M_HFSMNT */ \
-       "HFS node",     /* 76 M_HFSNODE */ \
-       "HFS fork",     /* 77 M_HFSFORK */ \
-       "VOLFS mount",  /* 78 M_VOLFSMNT */ \
-       "VOLFS node",   /* 79 M_VOLFSNODE */ \
-       "temp",         /* 80 M_TEMP */ \
-       "key mgmt",     /* 81 M_SECA */ \
-       "DEVFS",        /* 82 M_DEVFS */ \
-       "IpFw/IpAcct",  /* 83 M_IPFW */ \
-       "UDF node",     /* 84 M_UDFNODE */ \
-       "UDF mount",    /* 85 M_UDFMNT */ \
-       "IPv6 NDP",     /* 86 M_IP6NDP */ \
-       "IPv6 options", /* 87 M_IP6OPT */ \
-       "IPv6 Misc",    /* 88 M_IP6MISC */\
-       "TCP Segment Q",/* 89 M_TSEGQ */\
-       "IGMP state",   /* 90 M_IGMP */\
-       "Journal",    /* 91 M_JNL_JNL */\
-       "Transaction"    /* 92 M_JNL_TR */\
-}
+/* unused      91 */
+/* unused      92 */
+#define        M_SPECINFO      93      /* special file node */
+#define M_KQUEUE       94      /* kqueue system */
+/* unused      95 */
+#define M_CLRDAHEAD    96      /* storage for cluster read-ahead state */
+#define M_CLWRBEHIND   97      /* storage for cluster write-behind state */
+#define        M_IOV64         98      /* large iov's for 64 bit process */
+#define M_FILEGLOB     99      /* fileglobal */
+#define M_KAUTH                100     /* kauth subsystem */
+#define M_DUMMYNET     101     /* dummynet */
+/* M_UNSAFEFS 102 */
+#define M_MACPIPELABEL 103     /* MAC pipe labels */
+#define M_MACTEMP      104     /* MAC framework */
+#define M_SBUF         105     /* string buffers */
+#define M_EXTATTR      106     /* extended attribute */
+#define M_SELECT       107     /* per-thread select memory */
+/* M_TRAFFIC_MGT       108 */
+#if FS_COMPRESSION
+#define M_DECMPFS_CNODE        109     /* decmpfs cnode structures */
+#endif /* FS_COMPRESSION */
+#define M_INMFILTER    110     /* IPv4 multicast PCB-layer source filter */
+#define M_IPMSOURCE    111     /* IPv4 multicast IGMP-layer source filter */
+#define        M_IN6MFILTER    112     /* IPv6 multicast PCB-layer source filter */
+#define        M_IP6MOPTS      113     /* IPv6 multicast options */
+#define        M_IP6MSOURCE    114     /* IPv6 multicast MLD-layer source filter */
+#define M_FLOW_DIVERT_PCB      115 /* flow divert control block */
+#define M_FLOW_DIVERT_GROUP    116 /* flow divert socket group */
+#define M_IP6CGA       117
+#define M_NECP         118 /* General NECP policy data */
+#define M_NECP_SESSION_POLICY 119 /* NECP session policies */
+#define M_NECP_SOCKET_POLICY 120 /* NECP socket-level policies */
+#define M_NECP_IP_POLICY 121 /* NECP IP-level policies */
+#define M_FD_VN_DATA   122     /* Per fd vnode data */
+#define M_FD_DIRBUF    123     /* Directory entries' buffer */
+#define M_NETAGENT     124     /* Network Agents */
+#define M_EVENTHANDLER 125     /* Eventhandler */
+#define M_LLTABLE      126     /* Link layer table */
+#define M_NWKWQ                127     /* Network work queue */
+
+#define        M_LAST          128     /* Must be last type + 1 */
+
+#else /* BSD_KERNEL_PRIVATE */
+
+#define        M_RTABLE        5       /* routing tables */
+#define        M_IFADDR        9       /* interface address (IOFireWireIP)*/
+#define        M_LOCKF         40      /* Byte-range locking structures (msdos) */ 
+#define        M_TEMP          80      /* misc temporary data buffers */
+#define M_KAUTH                100     /* kauth subsystem (smb) */
+#define        M_SONAME        11      /* socket name (smb) */
+#define        M_PCB           4       /* protocol control block (smb) */
+#define M_UDFNODE      84      /* UDF inodes (udf)*/
+#define M_UDFMNT       85      /* UDF mount structures (udf)*/
+
+#endif /* BSD_KERNEL_PRIVATE */
+
+#ifdef BSD_KERNEL_PRIVATE

 
 

+#if KMEMSTATS

 struct kmemstats {
        long    ks_inuse;       /* # of packets of this type currently
                                 * in use */
 struct kmemstats {
        long    ks_inuse;       /* # of packets of this type currently
                                 * in use */


@@ -280,45 +253,119 @@ struct kmemstats {
        long    ks_spare;
 };
 
        long    ks_spare;
 };
 

-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE

 extern struct kmemstats kmemstats[];
 extern struct kmemstats kmemstats[];

-#endif /* __APPLE_API_PRIVATE */
+#endif /* KMEMSTATS */
+
+#endif /* BSD_KERNEL_PRIVATE */

 
 /*
  * The malloc/free primatives used
  * by the BSD kernel code.
  */
 
 /*
  * The malloc/free primatives used
  * by the BSD kernel code.
  */

+#ifdef XNU_KERNEL_PRIVATE
+
+#include <mach/vm_types.h>
+
+#define        MALLOC(space, cast, size, type, flags)                   \
+       ({ VM_ALLOC_SITE_STATIC(0, 0);                               \
+       (space) = (cast)__MALLOC(size, type, flags, &site); })
+
+#define        REALLOC(space, cast, addr, size, type, flags)            \
+       ({ VM_ALLOC_SITE_STATIC(0, 0);                               \
+       (space) = (cast)__REALLOC(addr, size, type, flags, &site); })
+
+#define        _MALLOC(size, type, flags)                               \
+       ({ VM_ALLOC_SITE_STATIC(0, 0);                               \
+       __MALLOC(size, type, flags, &site); })
+#define        _REALLOC(addr, size, type, flags)                        \
+       ({ VM_ALLOC_SITE_STATIC(0, 0);                               \
+       __REALLOC(addr, size, type, flags, &site); })
+
+#define        _MALLOC_ZONE(size, type, flags)                          \
+       ({ VM_ALLOC_SITE_STATIC(0, 0);                               \
+       __MALLOC_ZONE(size, type, flags, &site); })
+
+#define FREE(addr, type) \
+       _FREE((void *)addr, type)
+
+#define MALLOC_ZONE(space, cast, size, type, flags) \
+       (space) = (cast)_MALLOC_ZONE(size, type, flags)
+
+#define FREE_ZONE(addr, size, type) \
+       _FREE_ZONE((void *)addr, size, type)
+
+extern void    *__MALLOC(
+                       size_t                size,
+                       int                   type,
+                       int                   flags,
+                       vm_allocation_site_t *site)  __attribute__((alloc_size(1)));
+
+extern void    _FREE(
+                       void            *addr,
+                       int             type);
+
+extern void    *__REALLOC(
+                       void                 *addr,
+                       size_t                size,
+                       int                   type,
+                       int                   flags,
+                       vm_allocation_site_t *site)  __attribute__((alloc_size(2)));
+
+extern void    *__MALLOC_ZONE(
+                       size_t          size,
+                       int             type,
+                       int             flags,
+                       vm_allocation_site_t *site);
+
+extern void    _FREE_ZONE(
+                       void            *elem,
+                       size_t          size,
+                       int             type);
+
+#else /* XNU_KERNEL_PRIVATE */
+

 #define        MALLOC(space, cast, size, type, flags) \
        (space) = (cast)_MALLOC(size, type, flags)
 
 #define FREE(addr, type) \
        _FREE((void *)addr, type)
 
 #define        MALLOC(space, cast, size, type, flags) \
        (space) = (cast)_MALLOC(size, type, flags)
 
 #define FREE(addr, type) \
        _FREE((void *)addr, type)
 

+#define        REALLOC(space, cast, addr, size, type, flags) \
+       (space) = (cast)_REALLOC(addr, size, type, flags)
+

 #define MALLOC_ZONE(space, cast, size, type, flags) \
        (space) = (cast)_MALLOC_ZONE(size, type, flags)
 
 #define FREE_ZONE(addr, size, type) \
        _FREE_ZONE((void *)addr, size, type)
 
 #define MALLOC_ZONE(space, cast, size, type, flags) \
        (space) = (cast)_MALLOC_ZONE(size, type, flags)
 
 #define FREE_ZONE(addr, size, type) \
        _FREE_ZONE((void *)addr, size, type)
 

-extern void    *_MALLOC __P((
+extern void    *_MALLOC(

                        size_t          size,
                        int             type,
                        size_t          size,
                        int             type,

-                       int             flags));
+                       int             flags);

 
 

-extern void    _FREE __P((
+extern void    _FREE(

                        void            *addr,
                        void            *addr,

-                       int             type));
+                       int             type);

 
 

-extern void    *_MALLOC_ZONE __P((
+extern void    *_REALLOC(
+                       void            *addr,

                        size_t          size,
                        int             type,
                        size_t          size,
                        int             type,

-                       int             flags));
+                       int             flags);

 
 

-extern void    _FREE_ZONE __P((
+extern void    *_MALLOC_ZONE(
+                       size_t          size,
+                       int             type,
+                       int             flags);
+
+extern void    _FREE_ZONE(

                        void            *elem,
                        size_t          size,
                        void            *elem,
                        size_t          size,

-                       int             type));
+                       int             type);
+
+
+#endif /* !XNU_KERNEL_PRIVATE */

 
 #endif /* KERNEL */
 
 
 #endif /* KERNEL */