On Thu, Aug 07, 2025 at 10:59:29PM +0800, dayss1224@gmail.com wrote:
From: Quan Zhou zhouquan@iscas.ac.cn
To avoid redefinition issues with RISCV_FENCE, directly reference the existing macro in `rseq-riscv.h`.
Signed-off-by: Quan Zhou zhouquan@iscas.ac.cn Signed-off-by: Dong Yang dayss1224@gmail.com
tools/testing/selftests/rseq/rseq-riscv.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/testing/selftests/rseq/rseq-riscv.h b/tools/testing/selftests/rseq/rseq-riscv.h index 67d544aaa..06c840e81 100644 --- a/tools/testing/selftests/rseq/rseq-riscv.h +++ b/tools/testing/selftests/rseq/rseq-riscv.h @@ -8,6 +8,7 @@
- exception when executed in all modes.
*/ #include <endian.h> +#include <asm/fence.h> #if defined(__BYTE_ORDER) ? (__BYTE_ORDER == __LITTLE_ENDIAN) : defined(__LITTLE_ENDIAN) #define RSEQ_SIG 0xf1401073 /* csrr mhartid, x0 */ @@ -24,8 +25,6 @@ #define REG_L __REG_SEL("ld ", "lw ") #define REG_S __REG_SEL("sd ", "sw ") -#define RISCV_FENCE(p, s) \
- __asm__ __volatile__ ("fence " #p "," #s : : : "memory")
#define rseq_smp_mb() RISCV_FENCE(rw, rw) #define rseq_smp_rmb() RISCV_FENCE(r, r)
#define rseq_smp_wmb() RISCV_FENCE(w, w)
2.34.1
Reviewed-by: Andrew Jones ajones@ventanamicro.com