Date: Mon, 24 Oct 2022 10:22:18 -0500 From: Kyle Evans <kevans@freebsd.org> To: Jessica Clarke <jrtc27@freebsd.org> Cc: Takanori Watanabe <takawata@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: 9cf5db63698b - main - acpi_ged: fix build, as module and non INTRNG case. Message-ID: <CACNAnaFNPtAUS1dYEYhzpnpuzEAYmNnTuasxgYN7JzsdDEEzJA@mail.gmail.com> In-Reply-To: <170CEFAF-A78C-4DD7-A639-3B7090C5D347@freebsd.org> References: <202210241439.29OEdKOI013861@gitrepo.freebsd.org> <170CEFAF-A78C-4DD7-A639-3B7090C5D347@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Oct 24, 2022 at 10:16 AM Jessica Clarke <jrtc27@freebsd.org> wrote: > > On 24 Oct 2022, at 15:39, Takanori Watanabe <takawata@FreeBSD.org> wrote: > > > > The branch main has been updated by takawata: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D9cf5db63698b3c73edd63241= 2bf68735d3c20d37 > > > > commit 9cf5db63698b3c73edd632412bf68735d3c20d37 > > Author: Takanori Watanabe <takawata@FreeBSD.org> > > AuthorDate: 2022-10-24 14:19:12 +0000 > > Commit: Takanori Watanabe <takawata@FreeBSD.org> > > 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).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACNAnaFNPtAUS1dYEYhzpnpuzEAYmNnTuasxgYN7JzsdDEEzJA>