From nobody Mon Oct 24 14:39:20 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 4MwyQ106MTz4fb2G; Mon, 24 Oct 2022 14:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MwyQ06WKMz3LDK; Mon, 24 Oct 2022 14:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666622360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oniHJqe3JiEBe0jnHjRr+Ji/sGHRK4f7sjM5xo+smkE=; b=WDuRTAF2KXefBxwhR41r3RRsYyM2qZrqppVApbvjGGiI1Rjb9eTGZEExKFDRjjSECBeiGw NVN0tq8V0mzO+b6A/3zzgvgy4Wwd0VNoLI+jK1rOYHvboqrHd22nC384xn+zT0h4eT+mLU W7Nfutqb+Dc+JyLs8Kuhi7NwsHaQ1RMJoZeNMGh1YMzq/TRnudlg8sJOQlce9Rh52P3mIx T1HzBmYlGUmWmt8rQvcuDYqtjXyOsf6gIsKnWJoQpJHvlb2OaNNOiU1+9LD8fcKrt5Ly++ yiGRqSj6LNlmJ0b87Zp2j/zSqGreF7Ht5qO2KeAk6L2KonVJjreklATA71tRoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MwyQ05cVkzGf6; Mon, 24 Oct 2022 14:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29OEdK7E013862; Mon, 24 Oct 2022 14:39:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29OEdKOI013861; Mon, 24 Oct 2022 14:39:20 GMT (envelope-from git) Date: Mon, 24 Oct 2022 14:39:20 GMT Message-Id: <202210241439.29OEdKOI013861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Takanori Watanabe Subject: git: 9cf5db63698b - main - acpi_ged: fix build, as module and non INTRNG case. 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: takawata X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9cf5db63698b3c73edd632412bf68735d3c20d37 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666622360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oniHJqe3JiEBe0jnHjRr+Ji/sGHRK4f7sjM5xo+smkE=; b=cwNxPhjFZLGLDFkcah5HB7tbi5VBtC9A4/sMJZpQUZJu7IMR29g8gcMOXOIW3GwKPIKXDf L73eRqiGPewYfwADxXXAjoHe6LCqauKYNlQDTGeYMxhQtaOEWJ0M/HuiHfYGgyeJIJCWyq YkfFjDibKKhjJbstIGbjY7hGJ6pzdd4XdBiC1+2VPlyl7vvA7wda+Sm+Do/zfRVU11dKnS 3h90rr+1ZnoHobrTLN7bq/YsCzEA5RaGDufWanG3IXTka8djQ9sjWhGuoknV+cJizIsl9c F6Pc385kkCn7i//NqpFC1Bb7bnUVNVVrIHFyqqyLpcck6mYQUm521Z6TwmC5Ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666622360; a=rsa-sha256; cv=none; b=ECKlyLdhzSTDtTGGulMXcstSkqhe3dpftygHSC1xiDbdWw4Ps93D0onoy8OpFSz61iMJfK YjTDaPxQFV/LGku+Xoh1KKCnIUZeSuywsf4uI0XeRm0PQVpyjyCPNW9kKtutTGNaLirwpU XZQyOlYP0mTq2+w99d+ALH62EHLD5EwlKZZaKUf/CBYH3V+ehmzX6cH+j/2iyN/193XEFE QLfBz/a1DfW8X/Gz2Uhxb355qiZ+k1lND2LU1siyR1o8xrTLZI+yWT93ZM78TNR5E9rd2L E3qVe00+HDfPnWGKEcjx9kNu+C5SHFsJWGwQYnu7QXUEXdvXsKiwToMEZHBRew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by takawata: URL: https://cgit.FreeBSD.org/src/commit/?id=9cf5db63698b3c73edd632412bf68735d3c20d37 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 = rman_get_start(sc->evt[i].r); + rawirq = rman_get_start(sc->evts[i].r); trig = 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} == aarch64 +.if ${MACHINE_CPUARCH} == "aarch64" CFLAGS += -DINTRNG .endif KMOD= acpi_ged