26c26
< * $FreeBSD: head/sys/vm/uma_core.c 95758 2002-04-29 23:45:41Z jeff $
---
> * $FreeBSD: head/sys/vm/uma_core.c 95766 2002-04-30 04:26:34Z jeff $
1293c1293
< uma_zalloc_arg(uma_zone_t zone, void *udata, int wait)
---
> uma_zalloc_arg(uma_zone_t zone, void *udata, int flags)
1325a1326,1327
> if (flags & M_ZERO)
> bzero(item, zone->uz_size);
1392c1394
< NULL, wait, NULL);
---
> NULL, flags, NULL);
1400c1402
< if (uma_zalloc_internal(zone, udata, wait, bucket))
---
> if (uma_zalloc_internal(zone, udata, flags, bucket))
1413c1415
< return (uma_zalloc_internal(zone, udata, wait, NULL));
---
> return (uma_zalloc_internal(zone, udata, flags, NULL));
1422c1424
< * wait M_WAITOK or M_NOWAIT.
---
> * flags M_WAITOK, M_NOWAIT, M_ZERO.
1437c1439
< uma_zalloc_internal(uma_zone_t zone, void *udata, int wait, uma_bucket_t bucket)
---
> uma_zalloc_internal(uma_zone_t zone, void *udata, int flags, uma_bucket_t bucket)
1506c1508
< if (wait & M_WAITOK)
---
> if (flags & M_WAITOK)
1515c1517
< slab = slab_zalloc(zone, wait);
---
> slab = slab_zalloc(zone, flags);
1568c1570,1571
< wait = M_NOWAIT;
---
> flags |= M_NOWAIT;
> flags &= ~M_WAITOK;
1577c1580
< if (bucket == NULL && zone->uz_ctor != NULL)
---
> if (bucket == NULL && zone->uz_ctor != NULL) {
1578a1582,1584
> if (flags & M_ZERO)
> bzero(item, zone->uz_size);
> }