diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2002-05-20 17:46:57 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2002-05-20 17:46:57 +0000 |
| commit | 42e498655d9e58bbfb0c12740b9e691789f3c9a3 (patch) | |
| tree | 8a7344df34cfc2cf4ce712771fa914dc7229525d /sys/kern/kern_malloc.c | |
| parent | 184fec1a09e9e23e74658f32a0d1cfc21e2df177 (diff) | |
Notes
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 5e48278e1aa0..042832d73ab8 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -157,11 +157,9 @@ malloc(size, type, flags) if (size == 0) Debugger("zero size malloc"); #endif -#if defined(INVARIANTS) - if (flags == M_WAITOK) + if (!(flags & M_NOWAIT)) KASSERT(curthread->td_intr_nesting_level == 0, ("malloc(M_WAITOK) in interrupt context")); -#endif if (size <= KMEM_ZMAX) { if (size & KMEM_ZMASK) size = (size & ~KMEM_ZMASK) + KMEM_ZBASE; |