From owner-svn-src-all@FreeBSD.ORG Sat Dec 8 09:34:12 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B79C339E; Sat, 8 Dec 2012 09:34:12 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.dawidek.net (garage.dawidek.net [91.121.88.72]) by mx1.freebsd.org (Postfix) with ESMTP id 45A308FC0C; Sat, 8 Dec 2012 09:34:11 +0000 (UTC) Received: from localhost (58.wheelsystems.com [83.12.187.58]) by mail.dawidek.net (Postfix) with ESMTPSA id 33DC53B1; Sat, 8 Dec 2012 10:32:13 +0100 (CET) Date: Sat, 8 Dec 2012 10:35:42 +0100 From: Pawel Jakub Dawidek To: Neel Natu Subject: Re: svn commit: r243994 - head/sys/kern Message-ID: <20121208093542.GB1363@garage.freebsd.pl> References: <201212072215.qB7MFpOd095828@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="IrhDeMKUP4DT/M7F" Content-Disposition: inline In-Reply-To: X-OS: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Dec 2012 09:34:12 -0000 --IrhDeMKUP4DT/M7F Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 07, 2012 at 08:19:03PM -0800, Neel Natu wrote: > Hi Pawel, >=20 > On Fri, Dec 7, 2012 at 2:15 PM, Pawel Jakub Dawidek wro= te: > > Author: pjd > > Date: Fri Dec 7 22:15:51 2012 > > New Revision: 243994 > > URL: http://svnweb.freebsd.org/changeset/base/243994 > > > > Log: > > - Make socket_zone static - it is used only in this file. > > - Update maxsockets on uma_zone_set_max(). > > > > Obtained from: WHEEL Systems > > > > Modified: > > head/sys/kern/uipc_socket.c > > > > Modified: head/sys/kern/uipc_socket.c > > =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=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/sys/kern/uipc_socket.c Fri Dec 7 22:13:33 2012 (r24399= 3) > > +++ head/sys/kern/uipc_socket.c Fri Dec 7 22:15:51 2012 (r24399= 4) > > @@ -259,14 +259,14 @@ SYSCTL_NODE(_kern, KERN_IPC, ipc, CTLFLA > > * Initialize the socket subsystem and set up the socket > > * memory allocator. > > */ > > -uma_zone_t socket_zone; > > +static uma_zone_t socket_zone; > > int maxsockets; > > > > static void > > socket_zone_change(void *tag) > > { > > > > - uma_zone_set_max(socket_zone, maxsockets); > > + maxsockets =3D uma_zone_set_max(socket_zone, maxsockets); > > } > > > > static void > > @@ -275,7 +275,7 @@ socket_init(void *tag) > > > > socket_zone =3D uma_zcreate("socket", sizeof(struct socket), NU= LL, NULL, > > NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); > > - uma_zone_set_max(socket_zone, maxsockets); > > + maxsockets =3D uma_zone_set_max(socket_zone, maxsockets); > > EVENTHANDLER_REGISTER(maxsockets_change, socket_zone_change, NU= LL, > > EVENTHANDLER_PRI_FIRST); > > } >=20 > This is breaking "buildkernel": I forgot to commit one change from sys/sys/. That's why my local builds were working fine... Sorry about that! > cc -c -O2 -pipe -fno-strict-aliasing -std=3Dc99 -g -Wall > -Wredundant-decls -Wnested-externs -Wstrict-prototypes > -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef > -Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs > -fdiagnostics-show-option -Wno-error-tautological-compare > -Wno-error-empty-body -Wno-error-parentheses-equality -nostdinc -I. > -I/usr/freebsd/head/sys -I/usr/freebsd/head/sys/contrib/altq -D_KERNEL > -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h > -fno-omit-frame-pointer -mno-aes -mno-avx -mcmodel=3Dkernel > -mno-red-zone -mno-mmx -mno-sse -msoft-float > -fno-asynchronous-unwind-tables -ffreestanding -fstack-protector > -Werror /usr/freebsd/head/sys/kern/uipc_socket.c > /usr/freebsd/head/sys/kern/uipc_socket.c:262:19: error: static > declaration of 'socket_zone' follows non-static declaration > static uma_zone_t socket_zone; > ^ > /usr/freebsd/head/sys/sys/socketvar.h:297:25: note: previous definition i= s here > extern struct uma_zone *socket_zone; > ^ > 1 error generated. > *** [uipc_socket.o] Error code 1 > 1 error > *** [buildkernel] Error code 2 > 1 error >=20 > best > Neel --=20 Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://tupytaj.pl --IrhDeMKUP4DT/M7F Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlDDCe4ACgkQForvXbEpPzSOMwCgvyza8ty7XQOOOTp7oKKo6UrL nO4AniHER8RlQhGC9gb9FRmW5hckR+Sj =3iF9 -----END PGP SIGNATURE----- --IrhDeMKUP4DT/M7F--