From nobody Mon Oct 24 15:16:28 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 4MwzDw2l40z4fx4d for ; Mon, 24 Oct 2022 15:16:32 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 4MwzDv3ycdz3RdD for ; Mon, 24 Oct 2022 15:16:31 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wm1-f54.google.com with SMTP id l16-20020a05600c4f1000b003c6c0d2a445so6836854wmq.4 for ; Mon, 24 Oct 2022 08:16:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hSTaloZU9J5sjTleNTKqgOVnyeBQIEMnZBvU1JBqs+Y=; b=OsbJtqTeFAa1oB4eM95BlEN6yyNIFemHmKaIxMVPXt5mZCNHfpjwKN+8LVjDjN85jf XzrsMg/aJd2StnIyzhbrz1Njto2l4HIBJlTauGl0uUJz+lVUCXgmwf3kJEia6NHYmpi/ D8qbRIR2aPHdafAy5aqXVVi6MhGp8qlBlr8AggCwDSIl1f+PUNFQzJyof1pk2rmTrFTf NgvsBrS5g2ULJG1dAvkocWaI9s0JyPxMBrSIKyKQYkginsuiOUmiwY90Dp2UW9fv98mk 32+rQ713ywiHem9GiBtfuT4Amik5bjU4qABNRye/3vof4Ntuot4YszHIXprfHPcXnib4 fMJg== X-Gm-Message-State: ACrzQf28zN7B76P92hIUd0BqyN4qn0JnYoQteCiR7HI1fXSHJlxrYvsx 2LeQq9wdBKsSkV6jmlEPTZEXzPJCpXAMQA== X-Google-Smtp-Source: AMsMyM6gC4SZMq7+X7Tcu5AW4FNEvJn3CZqcVxa+gNTZURacFjTxen5ur+wBnRlUa0lyHpN9izAQrQ== X-Received: by 2002:a05:600c:3b17:b0:3c6:eaed:675 with SMTP id m23-20020a05600c3b1700b003c6eaed0675mr34907689wms.129.1666624590269; Mon, 24 Oct 2022 08:16:30 -0700 (PDT) Received: from smtpclient.apple (global-5-141.n-2.net.cam.ac.uk. [131.111.5.141]) by smtp.gmail.com with ESMTPSA id r20-20020a05600c425400b003b3307fb98fsm147783wmm.24.2022.10.24.08.16.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Oct 2022 08:16:29 -0700 (PDT) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: git: 9cf5db63698b - main - acpi_ged: fix build, as module and non INTRNG case. From: Jessica Clarke In-Reply-To: <202210241439.29OEdKOI013861@gitrepo.freebsd.org> Date: Mon, 24 Oct 2022 16:16:28 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <170CEFAF-A78C-4DD7-A639-3B7090C5D347@freebsd.org> References: <202210241439.29OEdKOI013861@gitrepo.freebsd.org> To: Takanori Watanabe X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Rspamd-Queue-Id: 4MwzDv3ycdz3RdD X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_DN_EQ_ADDR_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.54:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; MIME_TRACE(0.00)[0:+]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.54:from] X-ThisMailContainsUnwantedMimeParts: N On 24 Oct 2022, at 15:39, Takanori Watanabe = wrote: >=20 > The branch main has been updated by takawata: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D9cf5db63698b3c73edd632412bf68735= d3c20d37 >=20 > commit 9cf5db63698b3c73edd632412bf68735d3c20d37 > Author: Takanori Watanabe > AuthorDate: 2022-10-24 14:19:12 +0000 > Commit: Takanori Watanabe > CommitDate: 2022-10-24 14:37:28 +0000 >=20 > acpi_ged: fix build, as module and non INTRNG case. >=20 > Reviewed-by: cy >=20 > 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(-) >=20 > 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$ >=20 > .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? Jess