diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2015-12-21 02:22:18 -0500 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2016-01-12 13:46:50 -0500 |
commit | 90ff6a17d0e07d689886cba4244674bfd41e7a2d (patch) | |
tree | 5cd89aad6e619bc05d02746014b4dbeeb57c11d2 | |
parent | 335390d6096f647311980f50312b304b377e616f (diff) |
arm64: reuse asm-generic/barrier.h
On arm64 nop, 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/arm64/include/asm/barrier.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h index 9622eb48f894..91a43f48914d 100644 --- a/arch/arm64/include/asm/barrier.h +++ b/arch/arm64/include/asm/barrier.h | |||
@@ -91,14 +91,7 @@ do { \ | |||
91 | __u.__val; \ | 91 | __u.__val; \ |
92 | }) | 92 | }) |
93 | 93 | ||
94 | #define read_barrier_depends() do { } while(0) | 94 | #include <asm-generic/barrier.h> |
95 | #define smp_read_barrier_depends() do { } while(0) | ||
96 | |||
97 | #define smp_store_mb(var, value) do { WRITE_ONCE(var, value); smp_mb(); } while (0) | ||
98 | #define nop() asm volatile("nop"); | ||
99 | |||
100 | #define smp_mb__before_atomic() smp_mb() | ||
101 | #define smp_mb__after_atomic() smp_mb() | ||
102 | 95 | ||
103 | #endif /* __ASSEMBLY__ */ | 96 | #endif /* __ASSEMBLY__ */ |
104 | 97 | ||