diff options
| author | Will Deacon <will@kernel.org> | 2022-07-25 10:56:40 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-07-25 10:56:40 +0100 |
| commit | b7c47fd771aa19d00e093742be2672b8d963c389 (patch) | |
| tree | f12de817697104ad390ca801fcc43d3df17756d8 /include/asm-generic | |
| parent | 570365d365ddd28da2cf33b0cdfbe8c79ba67275 (diff) | |
| parent | 4d09caec2fab16977cf7c3f384a7daf76dc1f3fb (diff) | |
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 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/barrier.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h index fd7e8fbaeef1..961f4d88f9ef 100644 --- a/include/asm-generic/barrier.h +++ b/include/asm-generic/barrier.h @@ -38,6 +38,10 @@ #define wmb() do { kcsan_wmb(); __wmb(); } while (0) #endif +#ifdef __dma_mb +#define dma_mb() do { kcsan_mb(); __dma_mb(); } while (0) +#endif + #ifdef __dma_rmb #define dma_rmb() do { kcsan_rmb(); __dma_rmb(); } while (0) #endif @@ -65,6 +69,10 @@ #define wmb() mb() #endif +#ifndef dma_mb +#define dma_mb() mb() +#endif + #ifndef dma_rmb #define dma_rmb() rmb() #endif |