git: c5500a01c78a - main - arm64: bus: unhide bus_space definition with sanitizers included

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.
  */