diff options
author | Ruslan Ermilov <ru@FreeBSD.org> | 2005-08-02 20:03:23 +0000 |
---|---|---|
committer | Ruslan Ermilov <ru@FreeBSD.org> | 2005-08-02 20:03:23 +0000 |
commit | 2319835713094793c61125c0b4b9c3232d07da55 (patch) | |
tree | 3fcfc958d979bfa10554a4153170aa3451966fbd /sys/kern/kern_malloc.c | |
parent | aeffcba3c1abe8176d1eb2c7c857fac262a04366 (diff) | |
download | src-2319835713094793c61125c0b4b9c3232d07da55.tar.gz src-2319835713094793c61125c0b4b9c3232d07da55.zip |
Long overdue, keep up with mbuf.h,v 1.148.
Notes
Notes:
svn path=/head/; revision=148644
Diffstat (limited to 'sys/kern/kern_malloc.c')
-rw-r--r-- | sys/kern/kern_malloc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 0e3403bf1521..2171817e8a6a 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; |