git: 273fec048302 - stable/13 - atomic: Update interceptor function signatures after commit 5e9a82e898d5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Jan 2025 12:27:28 UTC
The branch stable/13 has been updated by olce:
URL: https://cgit.FreeBSD.org/src/commit/?id=273fec0483025b72a4d86ed5f26f8189f1dc58d2
commit 273fec0483025b72a4d86ed5f26f8189f1dc58d2
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-12-17 14:05:00 +0000
Commit: Olivier Certner <olce@FreeBSD.org>
CommitDate: 2025-01-17 12:24:55 +0000
atomic: Update interceptor function signatures after commit 5e9a82e898d5
Fixes: 5e9a82e898d5 ("atomics: Constify loads")
(cherry picked from commit fa5f4c10a8ce457bc1c4276933fd7dd34d75f6d6)
---
sys/kern/subr_asan.c | 2 +-
sys/kern/subr_csan.c | 2 +-
sys/sys/atomic_san.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c
index 9c33d0187a6d..d7173b0af04f 100644
--- a/sys/kern/subr_asan.c
+++ b/sys/kern/subr_asan.c
@@ -658,7 +658,7 @@ kasan_copyout(const void *kaddr, void *uaddr, size_t len)
}
#define _ASAN_ATOMIC_FUNC_LOAD(name, type) \
- type kasan_atomic_load_##name(volatile type *ptr) \
+ type kasan_atomic_load_##name(const volatile type *ptr) \
{ \
kasan_shadow_check((uintptr_t)ptr, sizeof(type), true, \
__RET_ADDR); \
diff --git a/sys/kern/subr_csan.c b/sys/kern/subr_csan.c
index 19f64e91f9e8..b2d5c4b63f6c 100644
--- a/sys/kern/subr_csan.c
+++ b/sys/kern/subr_csan.c
@@ -441,7 +441,7 @@ kcsan_copyout(const void *kaddr, void *uaddr, size_t len)
}
#define _CSAN_ATOMIC_FUNC_LOAD(name, type) \
- type kcsan_atomic_load_##name(volatile type *ptr) \
+ type kcsan_atomic_load_##name(const volatile type *ptr) \
{ \
kcsan_access((uintptr_t)ptr, sizeof(type), false, true, \
__RET_ADDR); \
diff --git a/sys/sys/atomic_san.h b/sys/sys/atomic_san.h
index eb6913296a45..22a8faa9e24e 100644
--- a/sys/sys/atomic_san.h
+++ b/sys/sys/atomic_san.h
@@ -65,10 +65,10 @@
type sp##_atomic_readandclear_##name(volatile type *)
#define ATOMIC_SAN_LOAD(sp, name, type) \
- type sp##_atomic_load_##name(volatile type *)
+ type sp##_atomic_load_##name(const volatile type *)
#define ATOMIC_SAN_LOAD_ACQ(sp, name, type) \
- type sp##_atomic_load_acq_##name(volatile type *)
+ type sp##_atomic_load_acq_##name(const volatile type *)
#define ATOMIC_SAN_STORE(sp, name, type) \
void sp##_atomic_store_##name(volatile type *, type)