From owner-svn-src-all@FreeBSD.ORG Sat Dec 8 04:44:36 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 007266C0; Sat, 8 Dec 2012 04:44:35 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by mx1.freebsd.org (Postfix) with ESMTP id A9E518FC12; Sat, 8 Dec 2012 04:44:35 +0000 (UTC) Received: by mail-pb0-f54.google.com with SMTP id wz12so818783pbc.13 for ; Fri, 07 Dec 2012 20:44:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=references:mime-version:in-reply-to:content-type :content-transfer-encoding:message-id:cc:x-mailer:from:subject:date :to; bh=1HYTQ49lSiSTJ0WLufbmo+jo8LrteeL2H0eWnIYBHbM=; b=R0BPcz8c/6Rv0KxqV1QPm3V8bVJP75pZsrx8aLz/bDA9UorqODO17uM5SL+gu8hxVJ NV+H4uy+BwN0wi4sSXZlndvxeU4se2R20oi8d+wmdMmhXNy87H4ej+HpQ3eLHnwv3IGc C20njYV3qp66WngRa2mF1ZbeNvEOo5u/czdMXT20HYtIaG74e8q3HV6XxxzwtQ9QV45V xc8tHXfmQM5RA+d/0QTfPCoj5sQG9xfuMd69D8mfh9jDDnhuv+jZlS9n1Plp6iH97eKw 0xLj+5QYYQPsRhlMF3REgiponTjWBeM/1Z7ZW/W4hWauTffK+057ZNC3dyYXJNkunCJs uDiw== Received: by 10.68.237.135 with SMTP id vc7mr21522606pbc.2.1354941869418; Fri, 07 Dec 2012 20:44:29 -0800 (PST) Received: from [10.71.0.13] (mobile-166-147-092-124.mycingular.net. [166.147.92.124]) by mx.google.com with ESMTPS id rk6sm5059196pbc.20.2012.12.07.20.44.26 (version=SSLv3 cipher=OTHER); Fri, 07 Dec 2012 20:44:28 -0800 (PST) References: <201212072215.qB7MFpOd095828@svn.freebsd.org> Mime-Version: 1.0 (1.0) In-Reply-To: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Message-Id: <01FC283D-D7E6-4703-AD2E-FB38FFA56D1D@gmail.com> X-Mailer: iPhone Mail (10A523) From: Garrett Cooper Subject: Re: svn commit: r243994 - head/sys/kern Date: Fri, 7 Dec 2012 20:43:58 -0800 To: Neel Natu Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Pawel Jakub Dawidek 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 04:44:36 -0000 On Dec 7, 2012, at 8:19 PM, Neel Natu wrote: > Hi Pawel, >=20 > On Fri, Dec 7, 2012 at 2:15 PM, Pawel Jakub Dawidek 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=