diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2019-11-21 13:12:58 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2019-11-21 13:12:58 +0000 |
| commit | bba0065f0d6d5d18d07f4b7f95fadc322c106c34 (patch) | |
| tree | e804fc2afd317aa126319d56e7b820ae9b4e6c49 /sys/kern/subr_csan.c | |
| parent | 1b8c58f2837f74218859012055a4a627ee89afc0 (diff) | |
| download | src-bba0065f0d6d5d18d07f4b7f95fadc322c106c34.tar.gz src-bba0065f0d6d5d18d07f4b7f95fadc322c106c34.zip | |
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
Notes
Notes:
svn path=/head/; revision=354946
Diffstat (limited to 'sys/kern/subr_csan.c')
| -rw-r--r-- | sys/kern/subr_csan.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sys/kern/subr_csan.c b/sys/kern/subr_csan.c index 6159a46835b4..b53bf4d74f01 100644 --- a/sys/kern/subr_csan.c +++ b/sys/kern/subr_csan.c @@ -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 |