diff options
| author | Will Deacon <will@kernel.org> | 2022-07-25 12:56:40 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-07-25 12:56:40 +0300 |
| commit | b7c47fd771aa19d00e093742be2672b8d963c389 (patch) | |
| tree | f12de817697104ad390ca801fcc43d3df17756d8 /arch/arm64/include | |
| parent | 570365d365ddd28da2cf33b0cdfbe8c79ba67275 (diff) | |
| parent | 4d09caec2fab16977cf7c3f384a7daf76dc1f3fb (diff) | |
| download | linux-b7c47fd771aa19d00e093742be2672b8d963c389.tar.xz | |
Merge branch 'for-next/kcsan' into for-next/core
* for-next/kcsan:
arm64: kcsan: Support detecting more missing memory barriers
asm-generic: Add memory barrier dma_mb()
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/barrier.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h index 9f3e2c3d2ca0..2cfc4245d2e2 100644 --- a/arch/arm64/include/asm/barrier.h +++ b/arch/arm64/include/asm/barrier.h @@ -50,13 +50,13 @@ #define pmr_sync() do {} while (0) #endif -#define mb() dsb(sy) -#define rmb() dsb(ld) -#define wmb() dsb(st) +#define __mb() dsb(sy) +#define __rmb() dsb(ld) +#define __wmb() dsb(st) -#define dma_mb() dmb(osh) -#define dma_rmb() dmb(oshld) -#define dma_wmb() dmb(oshst) +#define __dma_mb() dmb(osh) +#define __dma_rmb() dmb(oshld) +#define __dma_wmb() dmb(oshst) #define io_stop_wc() dgh() |