diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2015-12-21 07:22:18 (GMT) |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-01-12 18:46:48 (GMT) |
| commit | 21535aaed9e33b4cc485ab2245dd2958816ee916 (patch) | |
| tree | 32968177ce69fd2228b13a633f374dff04f4bf56 | |
| parent | fbd7ec02363cee4264aca2cc46692c9322fd6b42 (diff) | |
| download | linux-21535aaed9e33b4cc485ab2245dd2958816ee916.tar.xz | |
s390: reuse asm-generic/barrier.h
On s390 read_barrier_depends, smp_read_barrier_depends
smp_store_mb(), smp_mb__before_atomic and smp_mb__after_atomic match the
asm-generic variants exactly. Drop the local definitions and pull in
asm-generic/barrier.h instead.
This is in preparation to refactoring this code area.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
| -rw-r--r-- | arch/s390/include/asm/barrier.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h index 7ffd0b1..c358c31 100644 --- a/arch/s390/include/asm/barrier.h +++ b/arch/s390/include/asm/barrier.h @@ -30,14 +30,6 @@ #define smp_rmb() rmb() #define smp_wmb() wmb() -#define read_barrier_depends() do { } while (0) -#define smp_read_barrier_depends() do { } while (0) - -#define smp_mb__before_atomic() smp_mb() -#define smp_mb__after_atomic() smp_mb() - -#define smp_store_mb(var, value) do { WRITE_ONCE(var, value); smp_mb(); } while (0) - #define smp_store_release(p, v) \ do { \ compiletime_assert_atomic_type(*p); \ @@ -53,4 +45,6 @@ do { \ ___p1; \ }) +#include <asm-generic/barrier.h> + #endif /* __ASM_BARRIER_H */ |