From 780911f210a408f6be3a3db4c8109f17c3d283af Mon Sep 17 00:00:00 2001 From: phk Date: Mon, 10 Mar 2003 20:24:54 +0000 Subject: [PATCH] PHCC[1]: I had commented the #ifdef INVARIANTS checks out to make sure I ran this code in all kernels and forgot to comment the #ifdefs back in before I committed. Spotted by: bmilekic [1] PHCC = Pointy Hat Correction Commit --- sys/kern/kern_malloc.c | 4 ++-- sys/kern/subr_mbuf.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 978fc6a694aa..34f791ab2f6e 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -167,7 +167,7 @@ malloc(size, type, flags) #endif register struct malloc_type *ksp = type; -/* #ifdef INVARIANTS */ +#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. @@ -183,7 +183,7 @@ malloc(size, type, flags) once++; } } -/* #endif */ +#endif #if 0 if (size == 0) Debugger("zero size malloc"); diff --git a/sys/kern/subr_mbuf.c b/sys/kern/subr_mbuf.c index 285d376f10b7..f5e8abff85c1 100644 --- a/sys/kern/subr_mbuf.c +++ b/sys/kern/subr_mbuf.c @@ -614,7 +614,7 @@ mb_alloc(struct mb_lstmngr *mb_list, int how, short type, short persist, struct mb_bucket *bucket; void *m; -/* #ifdef INVARIANTS */ +#ifdef INVARIANTS int flags; flags = how & (M_WAITOK | M_NOWAIT | M_DONTWAIT | M_TRYWAIT); @@ -627,7 +627,7 @@ mb_alloc(struct mb_lstmngr *mb_list, int how, short type, short persist, how = M_TRYWAIT; } } -/* #endif */ +#endif m = NULL; if ((persist & MBP_PERSISTENT) != 0) {