The first parameter of rte_atomic_exchange_explicit() must be a pointer to _Atomic type. If run command "meson setup --werror -Denable_stdatomic=true build && ninja -C build", error will occur. Thia patch fixes it.
Fixes: 1ec6a845b5cb ("eal: use stdatomic API in public headers") Cc: sta...@dpdk.org Signed-off-by: Jie Hai <haij...@huawei.com> --- app/test/test_atomic.c | 6 +++--- lib/eal/include/generic/rte_atomic.h | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/test/test_atomic.c b/app/test/test_atomic.c index db07159e81ab..c3cb3ae0ea57 100644 --- a/app/test/test_atomic.c +++ b/app/test/test_atomic.c @@ -347,9 +347,9 @@ typedef union { const uint8_t CRC8_POLY = 0x91; uint8_t crc8_table[256]; -volatile uint16_t token16; -volatile uint32_t token32; -volatile uint64_t token64; +volatile RTE_ATOMIC(uint16_t) token16; +volatile RTE_ATOMIC(uint32_t) token32; +volatile RTE_ATOMIC(uint64_t) token64; static void build_crc8_table(void) diff --git a/lib/eal/include/generic/rte_atomic.h b/lib/eal/include/generic/rte_atomic.h index 0e639dad76a4..38c3b41f9c68 100644 --- a/lib/eal/include/generic/rte_atomic.h +++ b/lib/eal/include/generic/rte_atomic.h @@ -207,11 +207,11 @@ rte_atomic16_cmpset(volatile uint16_t *dst, uint16_t exp, uint16_t src) * The original value at that location */ static inline uint16_t -rte_atomic16_exchange(volatile uint16_t *dst, uint16_t val); +rte_atomic16_exchange(volatile RTE_ATOMIC(uint16_t) *dst, uint16_t val); #ifdef RTE_FORCE_INTRINSICS static inline uint16_t -rte_atomic16_exchange(volatile uint16_t *dst, uint16_t val) +rte_atomic16_exchange(volatile RTE_ATOMIC(uint16_t) *dst, uint16_t val) { return rte_atomic_exchange_explicit(dst, val, rte_memory_order_seq_cst); } @@ -492,11 +492,11 @@ rte_atomic32_cmpset(volatile uint32_t *dst, uint32_t exp, uint32_t src) * The original value at that location */ static inline uint32_t -rte_atomic32_exchange(volatile uint32_t *dst, uint32_t val); +rte_atomic32_exchange(volatile RTE_ATOMIC(uint32_t) *dst, uint32_t val); #ifdef RTE_FORCE_INTRINSICS static inline uint32_t -rte_atomic32_exchange(volatile uint32_t *dst, uint32_t val) +rte_atomic32_exchange(volatile RTE_ATOMIC(uint32_t) *dst, uint32_t val) { return rte_atomic_exchange_explicit(dst, val, rte_memory_order_seq_cst); } @@ -776,11 +776,11 @@ rte_atomic64_cmpset(volatile uint64_t *dst, uint64_t exp, uint64_t src) * The original value at that location */ static inline uint64_t -rte_atomic64_exchange(volatile uint64_t *dst, uint64_t val); +rte_atomic64_exchange(volatile RTE_ATOMIC(uint64_t) *dst, uint64_t val); #ifdef RTE_FORCE_INTRINSICS static inline uint64_t -rte_atomic64_exchange(volatile uint64_t *dst, uint64_t val) +rte_atomic64_exchange(volatile RTE_ATOMIC(uint64_t) *dst, uint64_t val) { return rte_atomic_exchange_explicit(dst, val, rte_memory_order_seq_cst); } -- 2.30.0