From owner-cvs-all@FreeBSD.ORG Wed Jul 21 10:50:00 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0D4A16A4CE; Wed, 21 Jul 2004 10:50:00 +0000 (GMT) Received: from gw.xbsd.org (xbsd.org [81.56.254.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id F03D643D39; Wed, 21 Jul 2004 10:49:54 +0000 (GMT) (envelope-from flz@xbsd.org) Received: from [192.168.42.2] (gatecrasher.xbsd.org [192.168.42.2]) by gw.xbsd.org (Postfix) with ESMTP id 43743719; Wed, 21 Jul 2004 12:49:54 +0200 (CEST) Message-ID: <40FE4AAD.4040800@xbsd.org> Date: Wed, 21 Jul 2004 12:51:25 +0200 From: Florent Thoumie User-Agent: Mozilla Thunderbird 0.7 (X11/20040707) X-Accept-Language: en-us, en MIME-Version: 1.0 To: cvs-src@FreeBSD.org, cvs-all@FreeBSD.org, alfred@FreeBSD.org Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: cvs commit: src/sys/kern uipc_mbuf.c uipc_mbuf2.c src/sys/sys mbuf.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2004 10:50:01 -0000 Alfred wrote : > alfred 2004-07-21 07:12:24 UTC > > FreeBSD src repository > > Modified files: > sys/kern uipc_mbuf.c uipc_mbuf2.c > sys/sys mbuf.h > Log: > Make sure we don't call mbuf allocation functions with mutexes held. > > Discussed with: rwatson > > Revision Changes Path > 1.134 +8 -0 src/sys/kern/uipc_mbuf.c > 1.26 +4 -0 src/sys/kern/uipc_mbuf2.c > 1.153 +16 -0 src/sys/sys/mbuf.h This breaks my kernel compilation : --- In file included from /usr/src/sys/dev/if_ndis/if_ndis.c:41: @/sys/mbuf.h: In function `m_get': @/sys/mbuf.h:341: warning: implicit declaration of function `WITNESS_WARN' @/sys/mbuf.h:341: error: `WARN_GIANTOK' undeclared (first use in this function) @/sys/mbuf.h:341: error: (Each undeclared identifier is reported only once @/sys/mbuf.h:341: error: for each function it appears in.) @/sys/mbuf.h:341: error: `WARN_SLEEPOK' undeclared (first use in this function) @/sys/mbuf.h: In function `m_getclr': @/sys/mbuf.h:356: error: `WARN_GIANTOK' undeclared (first use in this function) @/sys/mbuf.h:356: error: `WARN_SLEEPOK' undeclared (first use in this function) @/sys/mbuf.h: In function `m_gethdr': @/sys/mbuf.h:372: error: `WARN_GIANTOK' undeclared (first use in this function) @/sys/mbuf.h:372: error: `WARN_SLEEPOK' undeclared (first use in this function) @/sys/mbuf.h: In function `m_getcl': @/sys/mbuf.h:385: error: `WARN_GIANTOK' undeclared (first use in this function) @/sys/mbuf.h:385: error: `WARN_SLEEPOK' undeclared (first use in this function) @/sys/mbuf.h: In function `m_clget': @/sys/mbuf.h:413: error: `WARN_GIANTOK' undeclared (first use in this function) @/sys/mbuf.h:413: error: `WARN_SLEEPOK' undeclared (first use in this function) *** Error code 1 Stop in /usr/src/sys/modules/if_ndis. --- I suggest removing ths #ifdef WITNESS ... #endif around #include , since WITNESS_WARN must be defined in mbuf.h. PS: Sorry Alfred for the first mail, I should have posted this here in first place. -- flz