svn commit: r222748 - in head/sys: conf netinet netinet/ipfw netinet6

[Bruce Evans]

On Mon, 6 Jun 2011, Pan Tsu wrote:

> Robert Watson <rwatson at FreeBSD.org> writes:
>
>> Author: rwatson
>> Date: Mon Jun  6 12:55:02 2011
>> New Revision: 222748
>> URL: http://svn.freebsd.org/changeset/base/222748
>>
>> Log:
> [...]
>>   Connection group support is enabled by compiling "options PCBGROUP"
>>   into your kernel configuration; for the time being, this is an
>>   experimental feature, and hence is not enabled by default.
>
> Doesn't build with "nooption WITNESS" as in6_pcbgroup.c relies on
> <sys/mbuf.h> including <sys/lock.h> unconditionally, e.g.
>
>  $ make -s buildkernel
>  [...]
>  --------------------------------------------------------------
>  >>> stage 3.1: making dependencies
>  --------------------------------------------------------------
>  In file included from /usr/src/sys/netinet/in_pcb.h:47,
>                   from /usr/src/sys/netinet6/in6_pcbgroup.c:40:
>  /usr/src/sys/sys/rwlock.h:152:2: error: #error LOCK_DEBUG not defined, include <sys/lock.h> before <sys/rwlock.h>
>  mkdep: compile failed
>  *** Error code 1

<sys/mbuf.h> was disgustingly polluted even before it included <sys/lock.h>.

Bruce