Page MenuHomeFreeBSD
Files F147742446

D29103.id85341.diff
No OneTemporary
Actions

D29103.id85341.diff
View Options

diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -69,7 +69,7 @@
#endif
#if defined(KCSAN) && !defined(KCSAN_RUNTIME)
-#include <sys/_cscan_atomic.h>
+#include <sys/atomic_san.h>
#else
#include <sys/atomic_common.h>
diff --git a/sys/arm64/include/atomic.h b/sys/arm64/include/atomic.h
--- a/sys/arm64/include/atomic.h
+++ b/sys/arm64/include/atomic.h
@@ -54,7 +54,7 @@
#define rmb() dmb(ld) /* Full system memory barrier load */
#if defined(KCSAN) && !defined(KCSAN_RUNTIME)
-#include <sys/_cscan_atomic.h>
+#include <sys/atomic_san.h>
#else
#include <sys/atomic_common.h>
diff --git a/sys/arm64/include/bus.h b/sys/arm64/include/bus.h
--- a/sys/arm64/include/bus.h
+++ b/sys/arm64/include/bus.h
@@ -92,7 +92,7 @@
#define BUS_SPACE_BARRIER_WRITE 0x02
#if defined(KCSAN) && !defined(KCSAN_RUNTIME)
-#include <sys/_cscan_bus.h>
+#include <sys/bus_san.h>
#else
struct bus_space {
diff --git a/sys/kern/subr_csan.c b/sys/kern/subr_csan.c
--- a/sys/kern/subr_csan.c
+++ b/sys/kern/subr_csan.c
@@ -380,7 +380,7 @@
/* -------------------------------------------------------------------------- */
#include <machine/atomic.h>
-#include <sys/_cscan_atomic.h>
+#include <sys/atomic_san.h>
#define _CSAN_ATOMIC_FUNC_ADD(name, type) \
void kcsan_atomic_add_##name(volatile type *ptr, type val) \
@@ -688,7 +688,7 @@
#include <sys/bus.h>
#include <machine/bus.h>
-#include <sys/_cscan_bus.h>
+#include <sys/bus_san.h>
int
kcsan_bus_space_map(bus_space_tag_t tag, bus_addr_t hnd, bus_size_t size,
diff --git a/sys/sys/_cscan_atomic.h b/sys/sys/atomic_san.h
rename from sys/sys/_cscan_atomic.h
rename to sys/sys/atomic_san.h
--- a/sys/sys/_cscan_atomic.h
+++ b/sys/sys/atomic_san.h
@@ -32,8 +32,8 @@
* $FreeBSD$
*/
-#ifndef _SYS__CSAN_ATOMIC_H_
-#define _SYS__CSAN_ATOMIC_H_
+#ifndef _SYS_ATOMIC_SAN_H_
+#define _SYS_ATOMIC_SAN_H_
#ifndef _MACHINE_ATOMIC_H_
#error do not include this header, use machine/atomic.h
@@ -377,4 +377,4 @@
#endif /* !KCSAN_RUNTIME */
-#endif /* !_SYS__CSAN_ATOMIC_H_ */
+#endif /* !_SYS_ATOMIC_SAN_H_ */
diff --git a/sys/sys/_cscan_bus.h b/sys/sys/bus_san.h
rename from sys/sys/_cscan_bus.h
rename to sys/sys/bus_san.h
--- a/sys/sys/_cscan_bus.h
+++ b/sys/sys/bus_san.h
@@ -32,8 +32,8 @@
* $FreeBSD$
*/
-#ifndef _SYS__CSAN_BUS_H_
-#define _SYS__CSAN_BUS_H_
+#ifndef _SYS_BUS_SAN_H_
+#define _SYS_BUS_SAN_H_
#define KCSAN_BS_MULTI(rw, width, type) \
void kcsan_bus_space_##rw##_multi_##width(bus_space_tag_t, \
@@ -206,4 +206,4 @@
#endif /* !KCSAN_RUNTIME */
-#endif /* !_SYS__CSAN_BUS_H_ */
+#endif /* !_SYS_BUS_SAN_H_ */
diff --git a/sys/x86/include/bus.h b/sys/x86/include/bus.h
--- a/sys/x86/include/bus.h
+++ b/sys/x86/include/bus.h
@@ -136,7 +136,7 @@
#define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */
#if defined(KCSAN) && !defined(KCSAN_RUNTIME)
-#include <sys/_cscan_bus.h>
+#include <sys/bus_san.h>
#else
/*

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 14, 8:25 AM (21 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29642928
Default Alt Text
D29103.id85341.diff (2 KB)

Event Timeline