summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2005-08-02 20:03:23 +0000
committerru <ru@FreeBSD.org>2005-08-02 20:03:23 +0000
commitc7ff05fb0645dc1baaceece5a37ea0a394c2f092 (patch)
tree3fcfc958d979bfa10554a4153170aa3451966fbd
parentde5e77898473506992b4975393b2bc98c99bbdbb (diff)
downloadFreeBSD-src-c7ff05fb0645dc1baaceece5a37ea0a394c2f092.zip
FreeBSD-src-c7ff05fb0645dc1baaceece5a37ea0a394c2f092.tar.gz
Long overdue, keep up with mbuf.h,v 1.148.
-rw-r--r--sys/kern/kern_malloc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 0e3403b..2171817 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -268,10 +268,9 @@ malloc(unsigned long size, struct malloc_type *mtp, int flags)
#ifdef INVARIANTS
/*
- * To make sure that WAITOK or NOWAIT is set, but not more than
- * one, and check against the API botches that are common.
+ * Check that exactly one of M_WAITOK or M_NOWAIT is specified.
*/
- indx = flags & (M_WAITOK | M_NOWAIT | M_DONTWAIT | M_TRYWAIT);
+ indx = flags & (M_WAITOK | M_NOWAIT);
if (indx != M_NOWAIT && indx != M_WAITOK) {
static struct timeval lasterr;
static int curerr, once;
OpenPOWER on IntegriCloud