diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-05 14:27:01 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-05 14:27:01 +0000 |
| commit | f42afd0e0390a22dec05cda87c195d5d724d3ec8 (patch) | |
| tree | 6db5c9a6eb6d65ee136ba62cf48bfdd38dc0b2f0 /arch/arm/include/asm/barrier.h | |
| parent | 71b34fd1db384bb37b092bd6d0cf1b6be4fc7c26 (diff) | |
| parent | b7d82dc89e502312c4a819a9005341190fb12d1c (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android
Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/barrier.h
arch/arm64/include/asm/elf.h
arch/arm64/include/asm/ptrace.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/debug-monitors.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/kernel/kuser32.S
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/setup.c
arch/arm64/kernel/traps.c
kernel/fork.c
Diffstat (limited to 'arch/arm/include/asm/barrier.h')
| -rw-r--r-- | arch/arm/include/asm/barrier.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h index 60f15e274e6d..2f59f7443396 100644 --- a/arch/arm/include/asm/barrier.h +++ b/arch/arm/include/asm/barrier.h @@ -59,6 +59,21 @@ #define smp_wmb() dmb(ishst) #endif +#define smp_store_release(p, v) \ +do { \ + compiletime_assert_atomic_type(*p); \ + smp_mb(); \ + ACCESS_ONCE(*p) = (v); \ +} while (0) + +#define smp_load_acquire(p) \ +({ \ + typeof(*p) ___p1 = ACCESS_ONCE(*p); \ + compiletime_assert_atomic_type(*p); \ + smp_mb(); \ + ___p1; \ +}) + #define read_barrier_depends() do { } while(0) #define smp_read_barrier_depends() do { } while(0) |