diff options
| author |   csapuntz <csapuntz@openbsd.org> | 2001-02-21 23:24:29 +0000 |
|---|---|---|
| committer | csapuntz <csapuntz@openbsd.org> | 2001-02-21 23:24:29 +0000 |
| commit | bc75418a1e2dab66284a1ed387d0dabd962c9986 (patch) | |
| tree | a3fe0f405875958f0e076b635d8094cac0713557 /sys/kern/kern_malloc.c | |
| parent | + sis (diff) | |
| download | wireguard-openbsd-bc75418a1e2dab66284a1ed387d0dabd962c9986.tar.xz wireguard-openbsd-bc75418a1e2dab66284a1ed387d0dabd962c9986.zip | |
Latest soft updates from FreeBSD/Kirk McKusick
Snapshot-related code has been commented out.
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index d52ea29ef5e..6c2c7f3c046 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.23 2001/02/20 23:35:35 csapuntz Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.24 2001/02/21 23:24:29 csapuntz Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -135,11 +135,8 @@ malloc(size, type, flags) #endif #ifdef MALLOC_DEBUG - if (debug_malloc(size, type, flags, (void **)&va)) { - if ((flags & M_ZERO) && va != NULL) - bzero(va, size); + if (debug_malloc(size, type, flags, (void **)&va)) return ((void *) va); - } #endif indx = BUCKETINDX(size); @@ -312,8 +309,6 @@ out: out: #endif splx(s); - if ((flags & M_ZERO) && va != NULL) - bzero(va, size); return ((void *) va); } |