From nobody Mon Jul 20 07:34:54 2026 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 4h3XNG54Zyz6lVSY for ; Mon, 20 Jul 2026 07:34:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h3XNG4XQfz3pD8 for ; Mon, 20 Jul 2026 07:34:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784532894; 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=ur25TYHIFNztRmsIR2eeNZ2tEsTVHhy1TOWpiJQ+1oc=; b=cNn3ehJlw/m9OdTXqUCyPXQER/auFolUV71+gewwr1G5KzYVHIedkCC3/Gk8rxJHPebJMR //qVQePATnU4nObYYfC8yOJPvCuRH3XpEldMGXqeweg2VSP0mYNTqpUF8YC7kgMG83q5ZB tOd+67z5i82vL381yf1t58vCjJYzN3xqP1VNoyzcd2P4EaqN2rIJYrv+YjupZx27VCSbPo KP+iYvBbz8ZLmjTFh9dGcXYRNfXuNFMFDDMdPDOMmumY01oDA9DJbAaKR0WR81+CjiTYh0 BPuyyJ5ws0ZN4SD+keWSgbq2R6UJZSQaY1TkLUhQFKtTbRT3x1Do5PT6GfD0yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784532894; a=rsa-sha256; cv=none; b=t63XSkjhMFQUcUyE3rWniHi1LFPGj/20N8CkInPMM6c+7ieYI02j5/wWKsiE4x19Xki/iv OkixiQVUhQPvqaUtxaTbYfiE+jQNcVJeNY9C3EEeLZqMmtmM+RIkMwZ7fn5BqYtqJ7DOAq CJWhOBvXO+7mtYrpYWLmmG25+L1KiY1dRXZK8CoyaMEI97ucqnomq62ylNfYj25XToYRnb 1b6ATA0MJZXd1kZU2BoGAExSoE9KLa8PVfKtsLfxtx22TgkFPLTWjjW+kzIMrIucl7XjwZ kQegpKMdkOZHokhe2B34bXRx20rQVWPDwOl2GtTdJ2txiI/kWj3E2ZnZxw+5VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784532894; 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=ur25TYHIFNztRmsIR2eeNZ2tEsTVHhy1TOWpiJQ+1oc=; b=UX83R2gkMiZ3voERDbQF2xNGnPmnOvm4wC+L3y9DIFRs/5yZUMDPAUmlIQ/c59VC03oRtW 2DcRQ61cBdfdI98hdylDhE9aoGBRDUnQT0IvN5AbbYvQ9qVdiQDb/62aT16Ki7FSbsWatP DQX/DAGzVku8N3DqwKEgc1sGCiK40zPthtFtCcsJGsWAz3V2Ruo4JkwRsVNShFPNSz2E5v e2Ancr9Ij9l0nl3u9nAfVqxTvdJiPp/M93jh8FcUR2SkD1ZTf7+A4yioD2oBfJB5gE1dlJ QNe3qplsO5jFSdYTJ20iFfnxEmY5o7iNee1g2+bg/iGodDeOwNupW4d7tNSerw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3XNG3FMGzshW for ; Mon, 20 Jul 2026 07:34:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18782 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Jul 2026 07:34:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 7fc2c9f688ef - main - apei: Fix i386 build over bus read, write function 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fc2c9f688efb12beddd58a01628157e32b632b0 Auto-Submitted: auto-generated Date: Mon, 20 Jul 2026 07:34:54 +0000 Message-Id: <6a5dcf9e.18782.64d115f5@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=7fc2c9f688efb12beddd58a01628157e32b632b0 commit 7fc2c9f688efb12beddd58a01628157e32b632b0 Author: ShengYi Hung AuthorDate: 2026-07-20 07:26:56 +0000 Commit: ShengYi Hung CommitDate: 2026-07-20 07:34:42 +0000 apei: Fix i386 build over bus read, write function bus_{read,write}_8 are macro wrappers around the corresponding bus_space functions in sys/bus.h, so implementing bus_{read,write}_8 won't work. Implement the underlying bus_space function instead. Reviewed by: jrtc27, rlibby Fixes: 9313f6b01485 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58301 --- sys/dev/acpica/apeivar.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/dev/acpica/apeivar.h b/sys/dev/acpica/apeivar.h index 7820641aef1f..524bec4ab0d9 100644 --- a/sys/dev/acpica/apeivar.h +++ b/sys/dev/acpica/apeivar.h @@ -38,16 +38,17 @@ int apei_unmap_register(device_t dev, struct resource_map *map); #ifdef __i386__ static __inline uint64_t -bus_read_8(struct resource_map *res, bus_size_t offset) +bus_space_read_8(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset) { - return (bus_read_4(res, offset) | - ((uint64_t)bus_read_4(res, offset + 4)) << 32); + return (bus_space_read_4(tag, bsh, offset) | + ((uint64_t)bus_space_read_4(tag, bsh, offset + 4)) << 32); } static __inline void -bus_write_8(struct resource_map *res, bus_size_t offset, uint64_t val) +bus_space_write_8(bus_space_tag_t tag, bus_space_handle_t bsh, + bus_size_t offset, uint64_t val) { - bus_write_4(res, offset, val); - bus_write_4(res, offset + 4, val >> 32); + bus_space_write_4(tag, bsh, offset, val); + bus_space_write_4(tag, bsh, offset + 4, val >> 32); } #endif