Module Name: src
Committed By: riastradh
Date: Thu Nov 9 23:20:12 UTC 2017
Modified Files:
src/sys/kern: subr_kmem.c
Log Message:
Assert KM_SLEEP xor KM_NOSLEEP in all kmem allocation.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/kern/subr_kmem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_kmem.c
diff -u src/sys/kern/subr_kmem.c:1.64 src/sys/kern/subr_kmem.c:1.65
--- src/sys/kern/subr_kmem.c:1.64 Tue Nov 7 18:35:57 2017
+++ src/sys/kern/subr_kmem.c Thu Nov 9 23:20:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kmem.c,v 1.64 2017/11/07 18:35:57 christos Exp $ */
+/* $NetBSD: subr_kmem.c,v 1.65 2017/11/09 23:20:12 riastradh Exp $ */
/*-
* Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.64 2017/11/07 18:35:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.65 2017/11/09 23:20:12 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_kmem.h"
@@ -260,6 +260,9 @@ kmem_intr_alloc(size_t requested_size, k
KASSERT(requested_size > 0);
+ KASSERT((kmflags & KM_SLEEP) || (kmflags & KM_NOSLEEP));
+ KASSERT(!(kmflags & KM_SLEEP) || !(kmflags & KM_NOSLEEP));
+
#ifdef KMEM_GUARD
if (kmem_guard_enabled) {
return kmem_guard_alloc(&kmem_guard, requested_size,
