Author: andrew
Date: Thu Nov 21 13:12:58 2019
New Revision: 354946
URL: https://svnweb.freebsd.org/changeset/base/354946
Log:
Fix the bus_space functions with KCSAN on arm64.
Arm64 doesn't define the bus_space_set_multi_stream and
bus_space_set_region_stream functions. Don't try to define them there.
Sponsored by: DARPA, AFRL
Modified:
head/sys/kern/subr_csan.c
Modified: head/sys/kern/subr_csan.c
==============================================================================
--- head/sys/kern/subr_csan.c Thu Nov 21 12:29:20 2019 (r354945)
+++ head/sys/kern/subr_csan.c Thu Nov 21 13:12:58 2019 (r354946)
@@ -828,24 +828,32 @@ CSAN_BUS_WRITE_PTR_FUNC(region_stream, 8, uint64_t)
}
CSAN_BUS_SET_FUNC(multi, 1, uint8_t)
-CSAN_BUS_SET_FUNC(multi_stream, 1, uint8_t)
CSAN_BUS_SET_FUNC(region, 1, uint8_t)
+#if !defined(__aarch64__)
+CSAN_BUS_SET_FUNC(multi_stream, 1, uint8_t)
CSAN_BUS_SET_FUNC(region_stream, 1, uint8_t)
+#endif
CSAN_BUS_SET_FUNC(multi, 2, uint16_t)
-CSAN_BUS_SET_FUNC(multi_stream, 2, uint16_t)
CSAN_BUS_SET_FUNC(region, 2, uint16_t)
+#if !defined(__aarch64__)
+CSAN_BUS_SET_FUNC(multi_stream, 2, uint16_t)
CSAN_BUS_SET_FUNC(region_stream, 2, uint16_t)
+#endif
CSAN_BUS_SET_FUNC(multi, 4, uint32_t)
-CSAN_BUS_SET_FUNC(multi_stream, 4, uint32_t)
CSAN_BUS_SET_FUNC(region, 4, uint32_t)
+#if !defined(__aarch64__)
+CSAN_BUS_SET_FUNC(multi_stream, 4, uint32_t)
CSAN_BUS_SET_FUNC(region_stream, 4, uint32_t)
+#endif
#if !defined(__amd64__)
CSAN_BUS_SET_FUNC(multi, 8, uint64_t)
-CSAN_BUS_SET_FUNC(multi_stream, 8, uint64_t)
CSAN_BUS_SET_FUNC(region, 8, uint64_t)
+#if !defined(__aarch64__)
+CSAN_BUS_SET_FUNC(multi_stream, 8, uint64_t)
CSAN_BUS_SET_FUNC(region_stream, 8, uint64_t)
+#endif
#endif
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
