aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2001-01-27 06:32:20 +0000
committerPeter Wemm <peter@FreeBSD.org>2001-01-27 06:32:20 +0000
commit0fee3d35505ff45244042b1711bce8eb46fbd098 (patch)
treeef2a6d43026cb3b719f3879d13e4798ac910c7b2
parentbc234bdcacb538c53aa49c076caa121e306281d1 (diff)
downloadsrc-0fee3d35505ff45244042b1711bce8eb46fbd098.tar.gz
src-0fee3d35505ff45244042b1711bce8eb46fbd098.zip
p->p_intr_nesting_level is MI now and initialized to 0 in kern_fork.c,
so it should be save to KASSERT() on it even on an arch that may not use it.
Notes
Notes: svn path=/head/; revision=71707
-rw-r--r--sys/kern/kern_malloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 8e13dbe61031..089d867e4dfe 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -146,7 +146,7 @@ malloc(size, type, flags)
#endif
register struct malloc_type *ksp = type;
-#if defined(INVARIANTS) && defined(__i386__)
+#if defined(INVARIANTS)
if (flags == M_WAITOK)
KASSERT(curproc->p_intr_nesting_level == 0,
("malloc(M_WAITOK) in interrupt context"));