From nobody Fri Aug 18 16:02:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS68l5vlVz4qjwJ; Fri, 18 Aug 2023 16:02:47 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS68l54c8z3KX0; Fri, 18 Aug 2023 16:02:47 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTP id X1N8q1U3A6NwhX1vzqc9XU; Fri, 18 Aug 2023 16:02:47 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPA id X1vxqLGq8cyvuX1vyqVO0T; Fri, 18 Aug 2023 16:02:47 +0000 X-Authority-Analysis: v=2.4 cv=VbHkgXl9 c=1 sm=1 tr=0 ts=64df9627 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=UttIx32zK-AA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=gm5jsK0lSVYyjfQOp7EA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 04E2DDA4; Fri, 18 Aug 2023 09:02:44 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id DA239368; Fri, 18 Aug 2023 09:02:44 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Konstantin Belousov cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1384a0b940e8 - main - kern/subr_unit.c: fix non-debug build In-reply-to: References: <202308181337.37IDbMwl051912@gitrepo.freebsd.org> <20230818144345.9998F2EF@slippy.cwsent.com> <20230818153955.143512F3@slippy.cwsent.com> Comments: In-reply-to Konstantin Belousov message dated "Fri, 18 Aug 2023 18:47:05 +0300." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 18 Aug 2023 09:02:44 -0700 Message-Id: <20230818160244.DA239368@slippy.cwsent.com> X-CMAE-Envelope: MS4xfEzt/bJRcm9guNeko8rZ21gCAXDSnHCN+cPPZHYMxqU91vqSITFhpZS8Y79Ffxc5t+eIyNY/eKPClEBINXmS1aH3LSDVkrmWHz3B9KtLWRo24EvKXhr6 UVNO+qNZ+PK4npIq2FTpf23clYqDMI7KDArBZgGOJSnlkQwuTOaopy33iIRZzAWQcfXtABXSGX4jNmnHv76E6NGS2UJXGG1/GVcOfxo192InQ58yvT1K155W w9nqM6SlgLd0P2gALvesk4Ms6Y56Y/0Ijzg9ume6vqE+R4snNNKefc/GzZIexp7v+mmhY7u+h/5P0qddn5CpcufR6yCA6NSbg7g3iqsrJ/Y= X-Rspamd-Queue-Id: 4RS68l54c8z3KX0 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message , Konstantin Belousov writes: > On Fri, Aug 18, 2023 at 08:39:54AM -0700, Cy Schubert wrote: > > In message , Konstantin Belousov writes: > > > On Fri, Aug 18, 2023 at 07:43:45AM -0700, Cy Schubert wrote: > > > > In message <202308181337.37IDbMwl051912@gitrepo.freebsd.org>, Konstanti > n > > > > Belous > > > > ov writes: > > > > > The branch main has been updated by kib: > > > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=1384a0b940e87876d36d50ad > 5858 > > > 1c24 > > > > > dc642714 > > > > > > > > > > commit 1384a0b940e87876d36d50ad58581c24dc642714 > > > > > Author: Konstantin Belousov > > > > > AuthorDate: 2023-08-18 13:36:06 +0000 > > > > > Commit: Konstantin Belousov > > > > > CommitDate: 2023-08-18 13:37:16 +0000 > > > > > > > > > > kern/subr_unit.c: fix non-debug build > > > > > > > > > > Sponsored by: The FreeBSD Foundation > > > > > MFC after: 1 week > > > > > --- > > > > > sys/kern/subr_unit.c | 2 +- > > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > > > diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c > > > > > index 3d45a0c1c5cb..7a23f216d98e 100644 > > > > > --- a/sys/kern/subr_unit.c > > > > > +++ b/sys/kern/subr_unit.c > > > > > @@ -353,7 +353,7 @@ check_unrhdr(struct unrhdr *uh, int line) > > > > > struct unr *up; > > > > > struct unrb *ub; > > > > > int w; > > > > > - u_int y, z; > > > > > + u_int y __diagused, z __diagused; > > > > > > > > It still doesn't like it. > > > How do you build it? > > > Is it kernel? If yes, which kernel config? > > > > It's not in kernel. It's in tests. > > I see. Could you quickly check if this patch is enough? > I just started buildworld. > > commit 5e2dee9953a68344bdf1090b672bd9b04ae8f09f > Author: Konstantin Belousov > Date: Fri Aug 18 18:42:59 2023 +0300 > > subr_unit.c: another attempt to fix the build > > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > > diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c > index 7a23f216d98e..6826678104d6 100644 > --- a/sys/kern/subr_unit.c > +++ b/sys/kern/subr_unit.c > @@ -340,6 +340,10 @@ free_iter_unr(void *handle) > } > > #if defined(DIAGNOSTIC) || !defined(_KERNEL) > +#ifndef __diagused > +#define __diagused > +#endif > + > /* > * Consistency check function. > * Yup. That fixes it. Thanks. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 pñŸL