diff options
author | jeff <jeff@FreeBSD.org> | 2002-04-30 04:26:34 +0000 |
---|---|---|
committer | jeff <jeff@FreeBSD.org> | 2002-04-30 04:26:34 +0000 |
commit | 06a56984b5d6914defdf297800b55556596749a4 (patch) | |
tree | b4c7a4980a19a06cb96cd168f9300c8333294037 /sys/vm/uma.h | |
parent | 07648d50d3b80e5ed7439254ef9e41d47f19d0c5 (diff) | |
download | FreeBSD-src-06a56984b5d6914defdf297800b55556596749a4.zip FreeBSD-src-06a56984b5d6914defdf297800b55556596749a4.tar.gz |
Move the implementation of M_ZERO into UMA so that it can be passed to
uma_zalloc and friends. Remove this functionality from the malloc wrapper.
Document this change in uma.h and adjust variable names in uma_core.
Diffstat (limited to 'sys/vm/uma.h')
-rw-r--r-- | sys/vm/uma.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/vm/uma.h b/sys/vm/uma.h index 7f17b52..610c47d 100644 --- a/sys/vm/uma.h +++ b/sys/vm/uma.h @@ -198,8 +198,7 @@ void uma_zdestroy(uma_zone_t zone); * Arguments: * zone The zone we are allocating from * arg This data is passed to the ctor function - * wait This flag indicates whether or not we are allowed to block while - * allocating memory for this zone should we run out. + * flags See sys/malloc.h for available flags. * * Returns: * A non null pointer to an initialized element from the zone is @@ -207,7 +206,7 @@ void uma_zdestroy(uma_zone_t zone); * returned if the zone is empty or the ctor failed. */ -void *uma_zalloc_arg(uma_zone_t zone, void *arg, int wait); +void *uma_zalloc_arg(uma_zone_t zone, void *arg, int flags); /* * Allocates an item out of a zone without supplying an argument @@ -215,12 +214,12 @@ void *uma_zalloc_arg(uma_zone_t zone, void *arg, int wait); * This is just a wrapper for uma_zalloc_arg for convenience. * */ -static __inline void *uma_zalloc(uma_zone_t zone, int wait); +static __inline void *uma_zalloc(uma_zone_t zone, int flags); static __inline void * -uma_zalloc(uma_zone_t zone, int wait) +uma_zalloc(uma_zone_t zone, int flags) { - return uma_zalloc_arg(zone, NULL, wait); + return uma_zalloc_arg(zone, NULL, flags); } /* |