Index: uipc_mbuf.c
===================================================================
RCS file: /usr/home/kmacy/devel/cxgb/ncvs/src/sys/kern/uipc_mbuf.c,v
retrieving revision 1.171
diff -r1.171 uipc_mbuf.c
220a221
> #ifndef PACKET_ZONE_DISABLED			
225a227
> #endif			
333,334c335,339
< #define	M_SANITY_ACTION(s)	return (0)
< /* #define	M_SANITY_ACTION(s)	panic("mbuf %p: " s, m) */
---
> #ifdef INVARIANTS
> #define	M_SANITY_ACTION(s)	panic("mbuf %p: " s, m)
> #else 
> #define	M_SANITY_ACTION(s)	printf("mbuf %p: " s, m)
> #endif
368,375d372
< 		/* correct type correlations. */
< 		if (m->m_type == MT_HEADER && !(m->m_flags & M_PKTHDR)) {
< 			if (sanitize)
< 				m->m_type = MT_DATA;
< 			else
< 				M_SANITY_ACTION("MT_HEADER set but not M_PKTHDR");
< 		}
< 
Index: kern_mbuf.c
===================================================================
RCS file: /usr/home/kmacy/devel/cxgb/ncvs/src/sys/kern/kern_mbuf.c,v
retrieving revision 1.29
diff -r1.29 kern_mbuf.c
148a149
> #ifndef PACKET_ZONE_DISABLED
149a151
> #endif
160d161
< static int	mb_ctor_pack(void *, int, void *, int);
162a164,165
> #ifndef PACKET_ZONE_DISABLED
> static int	mb_ctor_pack(void *, int, void *, int);
166c169
< 
---
> #endif
203c206
< 
---
> #ifndef PACKET_ZONE_DISABLED
206c209
< 
---
> #endif
351c354
< 
---
> #ifndef PACKET_ZONE_DISABLED
384c387
< 
---
> #endif /* !PACKET_ZONE_DISABLED */
462c465
< 
---
> #ifndef PACKET_ZONE_DISABLED
551c554
< 
---
> #endif