From nobody Mon Sep 26 19:26:00 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 4Mbt5h4Bt0z4cY9r;
	Mon, 26 Sep 2022 19:26:00 +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 4Mbt5h3hpvz3XST;
	Mon, 26 Sep 2022 19:26:00 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1664220360;
	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=eTaMf+yTLFeUs95b/P39P8tChA6WwBnHd+OrtFsarkI=;
	b=MuDpoe2OJ4dq+6KpkMUZQHGoqHIvf+ojPP9bF3QfKYbEs4A81juPmlhEiadt3EWYJl8jNi
	2sU5Q/mOafOSRPH8Z4vSuBu12nm/SIk120QIwvKsOJcHpRJVKmbEwpk1ku+axFcruwqS+H
	LL+BujiDfDUR9NkuXwCzSLYCs3p2KulJhDIJ45W7Ujwz/BAw0QGBoNS/RSssLC2dwwZ/ue
	FViS/buKh3nURtyHxt92VZ17dL5mhVicBudY4TYNkG1U6bH2EkaazHkiWp5Nj1fxRKsZ7y
	KBKtJ6XUh45p40Qr05h4P92CZIqwaHoClnVoIW9rQCFuv3MLNJh9OT2GteE1rQ==
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 4Mbt5h2m9dzsLw;
	Mon, 26 Sep 2022 19:26:00 +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 28QJQ0ZH037855;
	Mon, 26 Sep 2022 19:26:00 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28QJQ01P037854;
	Mon, 26 Sep 2022 19:26:00 GMT
	(envelope-from git)
Date: Mon, 26 Sep 2022 19:26:00 GMT
Message-Id: <202209261926.28QJQ01P037854@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: Kyle Evans <kevans@FreeBSD.org>
Subject: git: c5500a01c78a - main - arm64: bus: unhide bus_space definition with sanitizers included
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
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: kevans
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: c5500a01c78a47dfa9004d97a24a5f03bcfa1f75
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1664220360;
	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=eTaMf+yTLFeUs95b/P39P8tChA6WwBnHd+OrtFsarkI=;
	b=mQxHI5Fn3h4sHvAaCse/Ic06vGnfyn/oKTZJmhvG2qY0oPP58h8NvkfUz5xBeaMY+q3wht
	bB2k5/mhRhN+/hazI3NOmYkoS4u/9JqBWWOmD6Wb5P5zh6Obg2v0C4khqKxmbPTDXNTMoW
	5zwKLMJUUTVXXsP+m5NuOJ2lcjiZ1OWBSntiaqBfbx6FIQvmMoK3SY9T2A5EqZnUs9ZBzj
	fEHa/gAb+ICnwj4uCAvBYTC+zECx+7uI3rUmMafHJhjE4QfCcZiPGlEJ/QCdwYoMaLvdAj
	XO9zlHu5BbYbkXcfKdUhMsMXMDRkDauCSZHLgNnPnqpz1HJUeu4X+Qi2IqNZKA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664220360; a=rsa-sha256; cv=none;
	b=vNvnU+jNL+JzHle74PIIHHCE7BXO+/g0rGnAMeu0I4q2pKnMJXjaw84YanHGSySQzMHuFu
	WZMc+0spti+SMhYY+oslfx+1j1HfttNVedN+yY0dcg6AAP1gM08YUMwTvOEKEIDX70xTqE
	XNl4fytkXvzNoIsFyN/k35OjRjq51Vhm97ZcSVTkAkWFFHf5OYY3TClguJrgymodLG3gwD
	4OKdnWDlZnj2Snms6GnyiS6DB8CWQT//XQbwfQDcEneX+3BR4+5oq5GEvVw5RjKsXAtdGM
	s+yG0t1XNK60qZXhpTmq1PzurnwxrDKSSzh56Fydb8r8+c89lNIOr5ggDJsu/A==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=c5500a01c78a47dfa9004d97a24a5f03bcfa1f75

commit c5500a01c78a47dfa9004d97a24a5f03bcfa1f75
Author:     Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2022-09-26 19:24:21 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2022-09-26 19:24:37 +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.
    Differential Revision:  https://reviews.freebsd.org/D36718
---
 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 b73106a2fe70..9fa430c1d311 100644
--- a/sys/arm64/include/bus.h
+++ b/sys/arm64/include/bus.h
@@ -92,10 +92,6 @@
 #define	BUS_SPACE_BARRIER_READ	0x01
 #define	BUS_SPACE_BARRIER_WRITE	0x02
 
-#if defined(SAN_NEEDS_INTERCEPTORS) && !defined(SAN_RUNTIME)
-#include <sys/bus_san.h>
-#else
-
 struct bus_space {
 	/* cookie */
 	void		*bs_cookie;
@@ -282,6 +278,10 @@ struct bus_space {
 			   bus_size_t, uint64_t);
 };
 
+#if defined(SAN_NEEDS_INTERCEPTORS) && !defined(SAN_RUNTIME)
+#include <sys/bus_san.h>
+#else
+
 /*
  * Utility macros; INTERNAL USE ONLY.
  */