Date: Fri, 7 Dec 2012 20:43:58 -0800 From: Garrett Cooper <yanegomi@gmail.com> To: Neel Natu <neelnatu@gmail.com> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, Pawel Jakub Dawidek <pjd@freebsd.org> Subject: Re: svn commit: r243994 - head/sys/kern Message-ID: <01FC283D-D7E6-4703-AD2E-FB38FFA56D1D@gmail.com> In-Reply-To: <CAFgRE9HQFX9MNcJD9_cTOs2XmTm0tEqDTwzgfkDwYFKj%2BT3HQw@mail.gmail.com> References: <201212072215.qB7MFpOd095828@svn.freebsd.org> <CAFgRE9HQFX9MNcJD9_cTOs2XmTm0tEqDTwzgfkDwYFKj%2BT3HQw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Dec 7, 2012, at 8:19 PM, Neel Natu <neelnatu@gmail.com> wrote: > Hi Pawel, >=20 > On Fri, Dec 7, 2012 at 2:15 PM, Pawel Jakub Dawidek <pjd@freebsd.org> wrot= e: >> Author: pjd >> Date: Fri Dec 7 22:15:51 2012 >> New Revision: 243994 >> URL: http://svnweb.freebsd.org/changeset/base/243994 >>=20 >> Log: >> - Make socket_zone static - it is used only in this file. >> - Update maxsockets on uma_zone_set_max(). >>=20 >> Obtained from: WHEEL Systems >>=20 >> Modified: >> head/sys/kern/uipc_socket.c >>=20 >> 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 (r243993)= >> +++ head/sys/kern/uipc_socket.c Fri Dec 7 22:15:51 2012 (r243994)= >> @@ -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; >>=20 >> static void >> socket_zone_change(void *tag) >> { >>=20 >> - uma_zone_set_max(socket_zone, maxsockets); >> + maxsockets =3D uma_zone_set_max(socket_zone, maxsockets); >> } >>=20 >> static void >> @@ -275,7 +275,7 @@ socket_init(void *tag) >>=20 >> socket_zone =3D uma_zcreate("socket", sizeof(struct socket), NULL,= 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, NULL,= >> EVENTHANDLER_PRI_FIRST); >> } >=20 > This is breaking "buildkernel": >=20 > 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 is= here > extern struct uma_zone *socket_zone; > ^ > 1 error generated. > *** [uipc_socket.o] Error code 1 > 1 error > *** [buildkernel] Error code 2 > 1 error +1. This broke tinderbox=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?01FC283D-D7E6-4703-AD2E-FB38FFA56D1D>