From nobody Fri Oct 28 18:12:55 2022 X-Original-To: dev-commits-src-main@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 4MzVyr1M8Wz4gkCB for ; Fri, 28 Oct 2022 18:13:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MzVyr0nRWz4C9Y for ; Fri, 28 Oct 2022 18:13:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-ed1-x52e.google.com with SMTP id v27so9063046eda.1 for ; Fri, 28 Oct 2022 11:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=WYZbI67Z3XXAmNqkzXsLR+SOa5XgGYv2FVMvvZjOHJ8=; b=vVfJqMPGG4UWAG2cjYbJ7LktGNhYY3iVu8e+V1WrW9220pw55QoQ+uzxAcQgJ8P620 YVQ/HuHhVRO1FN3oyv4O3Hx5bfwl4ZJ93rQrVzoQ51VrSVpgKm4jFvBA8jOFmtHNS3r6 zJWavwFtV4klAs7B04yriWrK4eehHKcdCSGa5hd1GP065l8b1ns9CpfT6Rn/02VLW9ZF uYe/nBTo2U6YhBdpEEILmgB0fbr9j56IWW7oGKCDmpiZ251QA9BV51Emer0SrHjjfkZY E8q7OguOgOzkMBybW4jnwZKhsMpjTT3ThCDF8BsHDyxe7XlE14KYAlmOORD8Cax6oOPb E/dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WYZbI67Z3XXAmNqkzXsLR+SOa5XgGYv2FVMvvZjOHJ8=; b=bk7XboqaolhkB3aeSHQWNrxR+2b8neM5QAZgoONba5VVjmhGzzBFP3H3LJ+r3+z6UE 0R1gnGofz0HHNQBP9JY1iknJjhwJ5nLwC5Vo+76FgL94iuoIPbdzNHFF20wgKuNCnb9o HZzsO2JwVssKrNcRZPrIVDWmnUegtohdZy2lak1u1posdyEJckTtFlwH9T1hw1wHRAxL S7vbTf1efrvuKmiOXmwR49rXMFx6XTkF3Mpty7XntVeXiqM4p3ADlBtMmMBM5/PSfHnU YVD3pxyY//nQWVbcX8BI+SdeojLpAZUxm/8dvxIOSYd3a3xQug5HIvc/qK+elaXY+aKK 33LA== X-Gm-Message-State: ACrzQf1F1X+IRubF2xzKAFoiTeYAIAcrqhNqFOnZpgVYRqlzPpUqnPqH Rpa/4afZkx9VcwA+XXYr2jlih2MGtd4d6kv4U5HprQ== X-Google-Smtp-Source: AMsMyM6k4yHnF4rAy2emGiZDEqF4/Olx8IygDjV6h3BwBHT3swizTicEkOgyEOAngYhjGfQ6kx3RSzC6WYVXokThExY= X-Received: by 2002:a05:6402:1394:b0:456:97cd:e9d4 with SMTP id b20-20020a056402139400b0045697cde9d4mr727607edv.174.1666980786701; Fri, 28 Oct 2022 11:13:06 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202210281753.29SHrut7052860@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Fri, 28 Oct 2022 12:12:55 -0600 Message-ID: Subject: Re: git: ba9f71ddeca8 - main - sys/modules: simplify a little by moving syscons to x86 only To: Jessica Clarke Cc: Warner Losh , src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000a39f0d05ec1c35ea" X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Rspamd-Queue-Id: 4MzVyr0nRWz4C9Y 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)[] X-ThisMailContainsUnwantedMimeParts: N --000000000000a39f0d05ec1c35ea Content-Type: text/plain; charset="UTF-8" On Fri, Oct 28, 2022, 11:57 AM Jessica Clarke wrote: > On 28 Oct 2022, at 18:53, Warner Losh wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=ba9f71ddeca84404e318b86078c91620f3d6375d > > > > commit ba9f71ddeca84404e318b86078c91620f3d6375d > > Author: Warner Losh > > AuthorDate: 2022-10-28 17:51:02 +0000 > > Commit: Warner Losh > > CommitDate: 2022-10-28 17:52:40 +0000 > > > > sys/modules: simplify a little by moving syscons to x86 only > > > > syscons is x86 only now that sparc has been retired. No need for the > > extra if. Also alphabetize p2sb. > > > > Sponsored by: Netflix > > --- > > sys/modules/Makefile | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/sys/modules/Makefile b/sys/modules/Makefile > > index 9784473fc522..1b03d41b5bd8 100644 > > --- a/sys/modules/Makefile > > +++ b/sys/modules/Makefile > > @@ -632,7 +632,6 @@ SUBDIR+= zfs > > > > .if ${MACHINE_CPUARCH} != "aarch64" && ${MACHINE_CPUARCH} != "arm" && \ > > ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "riscv" > > -_syscons= syscons > > .endif > > This is now empty? > Doh. Yea. I thought I'd killed that. Will fix :( Warner > Jess > > > .if ${MK_SOURCELESS_UCODE} != "no" > > @@ -693,6 +692,7 @@ _mgb= mgb > > _nctgpio= nctgpio > > _ntb= ntb > > _ocs_fc= ocs_fc > > +_p2sb= p2sb > > _qat= qat > > _qatfw= qatfw > > _qat_c2xxx= qat_c2xxx > > @@ -703,7 +703,7 @@ _rdma= rdma > > _safe= safe > > _speaker= speaker > > _splash= splash > > -_p2sb= p2sb > > +_syscons= syscons > > _wbwd= wbwd > > > > _aac= aac > > --000000000000a39f0d05ec1c35ea Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Fri, Oct 28, 2022, 11:57 AM Jessica Clarke <jrtc27@freebsd.org> wrote:
On 28 Oct 2022, at 18:53, Warner Losh <= imp@FreeBSD.org> wrote:
>
> The branch main has been updated by imp:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3Dba9f71ddeca84404e318b86078c916= 20f3d6375d
>
> commit ba9f71ddeca84404e318b86078c91620f3d6375d
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2022-10-28 17:51:02 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2022-10-28 17:52:40 +0000
>
>=C2=A0 =C2=A0 sys/modules: simplify a little by moving syscons to x86 o= nly
>
>=C2=A0 =C2=A0 syscons is x86 only now that sparc has been retired. No n= eed for the
>=C2=A0 =C2=A0 extra if. Also alphabetize p2sb.
>
>=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Net= flix
> ---
> sys/modules/Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sys/modules/Makefile b/sys/modules/Makefile
> index 9784473fc522..1b03d41b5bd8 100644
> --- a/sys/modules/Makefile
> +++ b/sys/modules/Makefile
> @@ -632,7 +632,6 @@ SUBDIR+=3D=C2=A0 zfs
>
> .if ${MACHINE_CPUARCH} !=3D "aarch64" && ${MACHINE_C= PUARCH} !=3D "arm" && \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0${MACHINE_CPUARCH} !=3D "powerpc" = && ${MACHINE_CPUARCH} !=3D "riscv"
> -_syscons=3D=C2=A0 =C2=A0 syscons
> .endif

This is now empty?

=

Doh. Yea.=C2=A0 =C2=A0I thoug= ht I'd killed that. Will fix :(

Warner=C2=A0
=
Jess

> .if ${MK_SOURCELESS_UCODE} !=3D "no"
> @@ -693,6 +692,7 @@ _mgb=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0mgb
> _nctgpio=3D=C2=A0 =C2=A0 =C2=A0nctgpio
> _ntb=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ntb
> _ocs_fc=3D=C2=A0 =C2=A0 =C2=A0 ocs_fc
> +_p2sb=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0p2sb > _qat=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qat
> _qatfw=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qatfw<= br> > _qat_c2xxx=3D=C2=A0 =C2=A0qat_c2xxx
> @@ -703,7 +703,7 @@ _rdma=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = rdma
> _safe=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 safe > _speaker=3D=C2=A0 =C2=A0 =C2=A0speaker
> _splash=3D=C2=A0 =C2=A0 =C2=A0 splash
> -_p2sb=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0p2sb > +_syscons=3D=C2=A0 =C2=A0 syscons
> _wbwd=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 wbwd >
> _aac=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0aac

--000000000000a39f0d05ec1c35ea--