Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:12:23 UTC 2021
Modified Files:
src/sys/external/bsd/common/include/linux: slab.h
Log Message:
linux: Allow GFP_NOWAIT too.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/common/include/linux/slab.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/common/include/linux/slab.h
diff -u src/sys/external/bsd/common/include/linux/slab.h:1.8 src/sys/external/bsd/common/include/linux/slab.h:1.9
--- src/sys/external/bsd/common/include/linux/slab.h:1.8 Sun Dec 19 12:07:55 2021
+++ src/sys/external/bsd/common/include/linux/slab.h Sun Dec 19 12:12:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: slab.h,v 1.8 2021/12/19 12:07:55 riastradh Exp $ */
+/* $NetBSD: slab.h,v 1.9 2021/12/19 12:12:23 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@ linux_gfp_to_kmem(gfp_t gfp)
* rather than allocate memory without respecting parameters we
* don't understand.
*/
- KASSERT((gfp == GFP_ATOMIC) ||
+ KASSERT((gfp == GFP_ATOMIC) || (gfp == GFP_NOWAIT) ||
((gfp & ~__GFP_WAIT) == (GFP_KERNEL & ~__GFP_WAIT)));
if (ISSET(gfp, __GFP_WAIT)) {
