Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Jul 2021 19:22:17 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: b2ed7e988a34 - main - bus: Convert to the new interceptor scheme
Message-ID:  <202107301922.16UJMH3d051775@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj:

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

commit b2ed7e988a34f373b13f4832e639ae9054d93aae
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2021-07-30 19:15:27 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2021-07-30 19:15:27 +0000

    bus: Convert to the new interceptor scheme
    
    This was missed in commit a90d053b8422.
    
    Fixes:          a90d053b8422
    MFC after:      2 weeks
    Sponsored by:   The FreeBSD Foundation
---
 sys/x86/x86/bus_machdep.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/x86/x86/bus_machdep.c b/sys/x86/x86/bus_machdep.c
index 3dc203f65694..2a5b6d8976ad 100644
--- a/sys/x86/x86/bus_machdep.c
+++ b/sys/x86/x86/bus_machdep.c
@@ -24,13 +24,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(KASAN) || defined(KCSAN)
-#define	SAN_RUNTIME
-#endif
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#ifdef SAN_NEEDS_INTERCEPTORS
+#define	SAN_RUNTIME
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <x86/bus.h>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107301922.16UJMH3d051775>