Date: Wed, 2 Nov 2022 17:03:05 GMT From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: b2fd407415af - stable/13 - arm64: bus: unhide bus_space definition with sanitizers included Message-ID: <202211021703.2A2H35XI064932@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b2fd407415afcaa19e80ac1b8cf6cbfa9278a5e5 commit b2fd407415afcaa19e80ac1b8cf6cbfa9278a5e5 Author: Mitchell Horne <mhorne@FreeBSD.org> AuthorDate: 2022-09-26 19:24:21 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> 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 <sys/bus_san.h> -#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 <sys/bus_san.h> +#else + /* * Utility macros; INTERNAL USE ONLY. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211021703.2A2H35XI064932>