From nobody Wed Nov 02 17:03:05 2022 X-Original-To: dev-commits-src-all@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 4N2Y9j3rv2z4gP7v; Wed, 2 Nov 2022 17:03:05 +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 4N2Y9j3F9Xz3q0y; Wed, 2 Nov 2022 17:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667408585; 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=RYV5MzCgvZE1zUZ4a/c9XMJ5iu+gc/HYwuinXj6YXGo=; b=pDGU6G42fNPzdaznnEGf5ZdHJXFSIz9eJhTYnxmEMnwuiInJh92FMOY0k9qsVvWn6rgFFA zxgoNc6zG4iWy7JlocjQ0LrjazoX+Ha93FgLRh8lX2aWbeZzqAm076Pf1MsbjvojrjXUwM Gc2eyogkx7MtQq5AAGQ2DoOrI7rOcQ93BziC5tzeogpnWti2B4CEmAES3N/2A/Hz2K17si xnqNhE9zNy5cb7eSlyF7o6xp8eu1PiErxSDhYjiMtsOOkxIj1AmUXt/QhrdSgGJCq2IDo5 SGNfvVdaC/OQ9XKtgKyZb+GZ2ON76kd+QBtpE19eVmBgNVqpliZrjOpP/dCspg== 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 4N2Y9j2M33z13wX; Wed, 2 Nov 2022 17:03:05 +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 2A2H35Vd064933; Wed, 2 Nov 2022 17:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A2H35XI064932; Wed, 2 Nov 2022 17:03:05 GMT (envelope-from git) Date: Wed, 2 Nov 2022 17:03:05 GMT Message-Id: <202211021703.2A2H35XI064932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b2fd407415af - stable/13 - arm64: bus: unhide bus_space definition with sanitizers included List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b2fd407415afcaa19e80ac1b8cf6cbfa9278a5e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667408585; 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=RYV5MzCgvZE1zUZ4a/c9XMJ5iu+gc/HYwuinXj6YXGo=; b=B4Davaaaa7pph6LY2T57lQsbdwe+ucPecZiu7PCRmMLf4s9BxLRfldQhrRQV2lf3fbO2HG P0WVeu42Rbk3430dAZ3kDfnNelswAdSTmgko0foM8HSQ+JN6tQvOskXRN2VkMW+SR6WTfI GNddCB2T5TJHNkfXYRuMdb8QZpoAn+/EUpzDxYCQ8pt4CWsTSCx2nZB8WwnV1QBe0uTxyc qutTcOSEX7FlErvkHEP7tFYxkwAtC2fSC82ivM6LnvUSbwUgVuli0XmuvzGp6II7ab24ke dkvUbZyQ+J5AE5ZsH3rdk7Yt/QGOFsgs9s6g8EoFlir5JF3zvtDy8t+dn46ufQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667408585; a=rsa-sha256; cv=none; b=IU6tKFNstQWry06irIKxk4AOknBTiJqY+WjcVrOVRl+FcX486xOkzl68yMyLD8tjBzvG/L geqJZXkwpHwZ9alIZYeR8Nf6D0gcjwKtZMPLHzPQTwa32LrdsxynVjatvE4NZKHAFx+2RM P9dDoJd2M/+M+dOd4oHZ94Rvr7QxLLz3owzp2ORBn71EBst81xzaejeGF1tDYISkIaT0lm c4aJaGRBLdLD1T9skjO70OoAs0z0jEzUkMUQXW4NKIFnf1HtP/vQJCleicHIHg63X/9Syr cVe+l8lWJpcJPAm4VbkhOP77o6IlPKBlutncmZb72b6JeJadU9VPzAPeNRQtYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b2fd407415afcaa19e80ac1b8cf6cbfa9278a5e5 commit b2fd407415afcaa19e80ac1b8cf6cbfa9278a5e5 Author: Mitchell Horne AuthorDate: 2022-09-26 19:24:21 +0000 Commit: Kyle Evans CommitDate: 2022-11-02 17:02:24 +0000 arm64: bus: unhide bus_space definition with sanitizers included We'll only be redefining the various bus_* macros, not the definition of struct bus_space. Reviewed by: andrew Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. (cherry picked from commit c5500a01c78a47dfa9004d97a24a5f03bcfa1f75) --- sys/arm64/include/bus.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm64/include/bus.h b/sys/arm64/include/bus.h index 5536e46948ab..fc768fc3e709 100644 --- a/sys/arm64/include/bus.h +++ b/sys/arm64/include/bus.h @@ -99,10 +99,6 @@ #endif #endif -#ifdef BUS_SAN_PREFIX -#include -#else - struct bus_space { /* cookie */ void *bs_cookie; @@ -289,6 +285,10 @@ struct bus_space { bus_size_t, uint64_t); }; +#ifdef BUS_SAN_PREFIX +#include +#else + /* * Utility macros; INTERNAL USE ONLY. */