From owner-freebsd-current@FreeBSD.ORG Fri Dec 9 07:55:33 2005 Return-Path: X-Original-To: current@freebsd.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9FF916A41F; Fri, 9 Dec 2005 07:55:33 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6063643D91; Fri, 9 Dec 2005 07:55:17 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id jB97tF62094113; Fri, 9 Dec 2005 09:55:15 +0200 (EET) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ipnet [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 42018-03-3; Fri, 9 Dec 2005 09:55:13 +0200 (EET) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id jB97sQFE094059 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Dec 2005 09:54:26 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.4/8.13.4) id jB97sVBx020038; Fri, 9 Dec 2005 09:54:31 +0200 (EET) (envelope-from ru) Date: Fri, 9 Dec 2005 09:54:30 +0200 From: Ruslan Ermilov To: FreeBSD Tinderbox Message-ID: <20051209075430.GG33744@ip.net.ua> References: <20051209021612.8DBA37302F@freebsd-current.sentex.ca> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Qf1oXS95uex85X0R" Content-Disposition: inline In-Reply-To: <20051209021612.8DBA37302F@freebsd-current.sentex.ca> User-Agent: Mutt/1.5.9i X-Virus-Scanned: by amavisd-new at ip.net.ua Cc: current@freebsd.org, i386@freebsd.org Subject: Re: [head tinderbox] failure on i386/i386 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2005 07:55:34 -0000 --Qf1oXS95uex85X0R Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 08, 2005 at 09:16:12PM -0500, FreeBSD Tinderbox wrote: > >>> Kernel build for LINT started on Fri Dec 9 02:15:40 UTC 2005 > >>> stage 1: configuring the kernel > >>> stage 2.1: cleaning up the object tree > >>> stage 2.2: rebuilding the object tree > >>> stage 2.3: build tools > >>> stage 3.1: making dependencies > [...] > from /src/sys/net/if.h:390, > from /src/sys/i386/i386/genassym.c:63: > /src/sys/sys/mbuf.h: In function `m_getjcl': > /src/sys/sys/mbuf.h:424: error: duplicate case value > /src/sys/sys/mbuf.h:421: error: previously used here > /src/sys/sys/mbuf.h: In function `m_cljget': > /src/sys/sys/mbuf.h:488: error: duplicate case value > /src/sys/sys/mbuf.h:485: error: previously used here > *** Error code 1 >=20 > Stop in /obj/src/sys/LINT. > *** Error code 1 >=20 > Stop in /src. > *** Error code 1 >=20 > Stop in /src. > TB --- 2005-12-09 02:16:12 - WARNING: /usr/bin/make returned exit code 1= =20 > TB --- 2005-12-09 02:16:12 - ERROR: failed to build lint kernel > TB --- 2005-12-09 02:16:12 - tinderbox aborted MCLBYTES is a tunable value, so I sent the following patch to Andre: %%% Index: mbuf.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/sys/mbuf.h,v retrieving revision 1.183 diff -u -p -r1.183 mbuf.h --- mbuf.h 8 Dec 2005 13:13:05 -0000 1.183 +++ mbuf.h 9 Dec 2005 07:51:50 -0000 @@ -421,15 +421,21 @@ m_getjcl(int how, short type, int flags, case MCLBYTES: zone =3D zone_clust; break; +#if MJUM4BYTES !=3D MCLBYTES case MJUM4BYTES: zone =3D zone_jumbo4; break; +#endif +#if MJUM9BYTES !=3D MCLBYTES case MJUM9BYTES: zone =3D zone_jumbo9; break; +#endif +#if MJUM16BYTES !=3D MCLBYTES case MJUM16BYTES: zone =3D zone_jumbo16; break; +#endif default: panic("%s: m_getjcl: invalid cluster type", __func__); } @@ -485,15 +491,21 @@ m_cljget(struct mbuf *m, int how, int si case MCLBYTES: zone =3D zone_clust; break; +#if MJUM4BYTES !=3D MCLBYTES case MJUM4BYTES: zone =3D zone_jumbo4; break; +#endif +#if MJUM9BYTES !=3D MCLBYTES case MJUM9BYTES: zone =3D zone_jumbo9; break; +#endif +#if MJUM16BYTES !=3D MCLBYTES case MJUM16BYTES: zone =3D zone_jumbo16; break; +#endif default: panic("%s: m_getjcl: invalid cluster type", __func__); } %%% Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --Qf1oXS95uex85X0R Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFDmTg2qRfpzJluFF4RAjmoAJ9AoQMNgdrO7xA4LyPr5Ge5N0thdgCdH42S E1jOc78aPJn/X6liifRymNQ= =EqvO -----END PGP SIGNATURE----- --Qf1oXS95uex85X0R--