diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-05-12 05:09:56 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-05-12 05:09:56 +0000 |
| commit | 1282e9aceaf070a6db4f0f11cd294fff4510f0d0 (patch) | |
| tree | f736ef4a594e2e1879a5a2b7318838c9d61b00c3 /sys/kern/kern_malloc.c | |
| parent | 3d5371a1a6b7252b1d98cdd32e2b2924967603e9 (diff) | |
Notes
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 7dd47268a1f3..dc83772b5b07 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -250,13 +250,12 @@ out: ksp->ks_maxused = ksp->ks_memuse; mtx_unlock(&ksp->ks_mtx); - if (!(flags & M_NOWAIT)) + if (flags & M_WAITOK) KASSERT(va != NULL, ("malloc(M_WAITOK) returned NULL")); - if (va == NULL) { + else if (va == NULL) t_malloc_fail = time_uptime; - } #ifdef DIAGNOSTIC - if (!(flags & M_ZERO)) { + if (va != NULL && !(flags & M_ZERO)) { memset(va, 0x70, osize); } #endif |