git: dd0fae3028d2 - stable/14 - atomic: Update interceptor function signatures after commit 5e9a82e898d5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 16 Jan 2025 18:08:38 UTC
The branch stable/14 has been updated by olce:
URL: https://cgit.FreeBSD.org/src/commit/?id=dd0fae3028d22ec9e9c98172aedfde46c3534186
commit dd0fae3028d22ec9e9c98172aedfde46c3534186
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-12-17 14:05:00 +0000
Commit: Olivier Certner <olce@FreeBSD.org>
CommitDate: 2025-01-16 18:07:01 +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/kern/subr_msan.c | 2 +-
sys/sys/atomic_san.h | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c
index c934ff83874e..51bf1f684c79 100644
--- a/sys/kern/subr_asan.c
+++ b/sys/kern/subr_asan.c
@@ -750,7 +750,7 @@ kasan_casueword(volatile u_long *base, u_long oldval, u_long *oldvalp,
}
#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 368f8b6ba981..e8f0eeabbca6 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/kern/subr_msan.c b/sys/kern/subr_msan.c
index b596443de2aa..07e894e4c3db 100644
--- a/sys/kern/subr_msan.c
+++ b/sys/kern/subr_msan.c
@@ -1220,7 +1220,7 @@ kmsan_casueword(volatile u_long *base, u_long oldval, u_long *oldvalp,
}
#define _MSAN_ATOMIC_FUNC_LOAD(name, type) \
- type kmsan_atomic_load_##name(volatile type *ptr) \
+ type kmsan_atomic_load_##name(const volatile type *ptr) \
{ \
kmsan_check_arg(sizeof(ptr), \
"atomic_load_" #name "():args"); \
diff --git a/sys/sys/atomic_san.h b/sys/sys/atomic_san.h
index e22324b87623..93a9bfcbf593 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)