summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Feldman <green@FreeBSD.org>2004-07-04 15:59:25 +0000
committerBrian Feldman <green@FreeBSD.org>2004-07-04 15:59:25 +0000
commit7a708c3626138bb97c0207a8bea68a56fa71aab4 (patch)
tree4d4bb84b825ce1e3098b1eb1a3d155bc835463d6
parent4c9e94d42c70f2eca1952ec8dcb3da772907c240 (diff)
Notes
-rw-r--r--sys/vm/uma_core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index 1012df595f06..9e1f7d4d0bf3 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$");
#include <sys/proc.h>
#include <sys/smp.h>
#include <sys/vmmeter.h>
-#include <sys/mbuf.h>
+#include <sys/mbuf.h> /* XXX WITNESS_WARN() hack */
#include <vm/vm.h>
#include <vm/vm_object.h>
@@ -1613,7 +1613,9 @@ uma_zalloc_arg(uma_zone_t zone, void *udata, int flags)
if (!(flags & M_NOWAIT)) {
KASSERT(curthread->td_intr_nesting_level == 0,
("malloc(M_WAITOK) in interrupt context"));
- if (strcmp(zone->uz_name, "Mbuf") == 0)
+ if ((zone_mbuf != NULL && zone == zone_mbuf) ||
+ (zone_clust != NULL && zone == zone_clust) ||
+ (zone_pack != NULL && zone == zone_pack))
#ifdef WITNESS
badness = WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK,
NULL,