From nobody Mon Oct 24 15:22:18 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 4MwzMp5SgSz4fxYP; Mon, 24 Oct 2022 15:22:30 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MwzMp4tfpz3SMY; Mon, 24 Oct 2022 15:22:30 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666624950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l2eYwkDVW4c87Vmju8J9IzboAFBfFE6G9w8IDzwJakU=; b=jisq5RWZk1bj0E2ilc2Ttn3IJPCWUi2EcrC/imt0woisPYFUz8lboDJHHxs8p6HGHI9Veb EYbxfzFbMpOL349Lcl54dDpltZoULAgFjbRnR/NDzs1i8A378PSsAVkDaMl6m8ISm0CxOI 8VWqpjUnx13URl572VB4bTwyUg1yvithrApa2tn+XjlZlZQlXqJTYCATIA0lU6jI/5abGP YAbUxK4WA+Csf2/I1B17eB0JuGzodIuPPua4KVKM0/TWRdZ1T3AcBF5ooFN+xWdXV3Dpmu W0QPJFftgQ+U31VXAR+7i3wvYbJKt2ykcEIGtRG8gPtYUC2vL230GPlKBxH/IA== Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (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)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4MwzMp3yTvzr1M; Mon, 24 Oct 2022 15:22:30 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f173.google.com with SMTP id j21so6240986qkk.9; Mon, 24 Oct 2022 08:22:30 -0700 (PDT) X-Gm-Message-State: ACrzQf3qIblVwV37I/ZA0G8m1L0M7JB63hNmGhsTL2UMmCKCUxUXqV8O NLIUd98mDICcnxIy/LLhxBF9BMjOyZ7X4sSMNhM= X-Google-Smtp-Source: AMsMyM7eKGeHQLqUFnCxbHhoCCodsvkhogDFY3YXnIDE90CW2LWFIKJOaLJxPaFDFKKcnb9oF+edKNZSX5rWCpTZQi0= X-Received: by 2002:a37:34e:0:b0:6ea:2cef:131f with SMTP id 75-20020a37034e000000b006ea2cef131fmr23076458qkd.554.1666624950082; Mon, 24 Oct 2022 08:22:30 -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: <202210241439.29OEdKOI013861@gitrepo.freebsd.org> <170CEFAF-A78C-4DD7-A639-3B7090C5D347@freebsd.org> In-Reply-To: <170CEFAF-A78C-4DD7-A639-3B7090C5D347@freebsd.org> From: Kyle Evans Date: Mon, 24 Oct 2022 10:22:18 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 9cf5db63698b - main - acpi_ged: fix build, as module and non INTRNG case. To: Jessica Clarke Cc: Takanori Watanabe , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666624950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l2eYwkDVW4c87Vmju8J9IzboAFBfFE6G9w8IDzwJakU=; b=VoEqD+9ZXA/LdGFt/4qnogfOhBO/8vhuu6rcmhuKcBVEm26aIvoX9v8JZTZ/mTkgxC3Iec DA9lPdbnvQ1GNIFiJMf8iGj9fWs/dBJGiSTfnXaLrUjRGHCTT6uYbE9SWOI4F4IO+Kn7of 9B+fYitoNcGy2moe+cj1Ma9/qszyVTUzO6ogU83IM9veoDgfY1/Kz0McSphbKLyPaicgOK bWZEV775UyULrsorzbCd1qo8qPzPWoYvU7ocf/WnvHasE5jkbyUI20xvBScj/aZrvEdGU/ 2aVkjVzmKcCf1iiRorliOGbTKzR5bO177TMckLMOtJVImD/nHInWtDVaKofViw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666624950; a=rsa-sha256; cv=none; b=yLSB9uyXewcB9U65v4w8787TLQleNYL+E41evTlcPVAvycIRsPRKSatB57MHjSFZSfWCzK PMYZhogcTOsYD2iE2sHOShqUAgPUk+15fGPTj6KjdKdqPA8LzO8gqNMQ+ahOgR/DXBrXaa sP+OPZOP9PidWsb95YxioGjlWds4kafFy27lzHP8N6Zbqlx1Sf9vSNU8fOQaZ6ILL060tm uK2glHtYTARBj6Y77/d229E6CAz7nuWal/IDdu2xGLKUfuyC1sJ14Ga/OoN8+QXk9NQ5AB mKRGH5LntYzO8skOux6Vz2cbSN7Z5KiUzFXbkz+AN4Vvx+73A6bmDPsKEDtxiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Mon, Oct 24, 2022 at 10:16 AM Jessica Clarke wrote: > > On 24 Oct 2022, at 15:39, Takanori Watanabe wrote: > > > > The branch main has been updated by takawata: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D9cf5db63698b3c73edd63241= 2bf68735d3c20d37 > > > > commit 9cf5db63698b3c73edd632412bf68735d3c20d37 > > Author: Takanori Watanabe > > AuthorDate: 2022-10-24 14:19:12 +0000 > > Commit: Takanori Watanabe > > CommitDate: 2022-10-24 14:37:28 +0000 > > > > acpi_ged: fix build, as module and non INTRNG case. > > > > Reviewed-by: cy > > > > Differential Revision: https://reviews.freebsd.org/D37104 > > --- > > sys/dev/acpica/acpi_ged.c | 2 +- > > sys/modules/acpi/acpi_ged/Makefile | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/sys/dev/acpica/acpi_ged.c b/sys/dev/acpica/acpi_ged.c > > index 9459ccc3525b..8ee56c8b0335 100644 > > --- a/sys/dev/acpica/acpi_ged.c > > +++ b/sys/dev/acpica/acpi_ged.c > > @@ -198,7 +198,7 @@ acpi_ged_attach(device_t dev) > > } > > } > > #else > > - rawirq =3D rman_get_start(sc->evt[i].r); > > + rawirq =3D rman_get_start(sc->evts[i].r); > > trig =3D INTR_TRIGGER_LEVEL; > > if (ACPI_SUCCESS(acpi_lookup_irq_resource > > (dev, sc->evts[i].rid, > > diff --git a/sys/modules/acpi/acpi_ged/Makefile b/sys/modules/acpi/acpi= _ged/Makefile > > index a937249357f4..87dd53b88b2b 100644 > > --- a/sys/modules/acpi/acpi_ged/Makefile > > +++ b/sys/modules/acpi/acpi_ged/Makefile > > @@ -1,7 +1,7 @@ > > # $FreeBSD$ > > > > .PATH: ${SRCTOP}/sys/dev/acpica > > -.if ${TARGET_ARCH} =3D=3D aarch64 > > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" > > CFLAGS +=3D -DINTRNG > > .endif > > KMOD=3D acpi_ged > > Why isn=E2=80=99t acpi_ged.c just #include=E2=80=99ing opt_global.h? > I suspect this is trying to cope with untied builds, though I agree it's using the wrong approach. We should push this into sys/conf/config.mk instead (+ arm, riscv), which should do the right thing and actually #define it in opt_global.h (which is included via CFLAGS).