diff options
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 7dd4726..dc83772 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 |
