arm: reuse asm-generic/barrier.h (335390d6) · Commits · 戴 / test

On arm smp_store_mb, read_barrier_depends, smp_read_barrier_depends, smp_store_release, smp_load_acquire, 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:

Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:

Peter Zijlstra (Intel) <peterz@infradead.org>

arch/arm/include/asm/barrier.h

+1 −22

Original line number	Diff line number	Diff line
		@@ -70,28 +70,7 @@ extern void arm_heavy_mb(void);
		#define smp_wmb() dmb(ishst)
		#endif

		#define smp_store_release(p, v) \
		do { \
		compiletime_assert_atomic_type(*p); \
		smp_mb(); \
		WRITE_ONCE(*p, v); \
		} while (0)

		#define smp_load_acquire(p) \
		({ \
		typeof(p) ___p1 = READ_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)

		#define smp_store_mb(var, value) do { WRITE_ONCE(var, value); smp_mb(); } while (0)

		#define smp_mb__before_atomic() smp_mb()
		#define smp_mb__after_atomic() smp_mb()
		#include <asm-generic/barrier.h>

		#endif /* !__ASSEMBLY__ */
		#endif /* __ASM_BARRIER_H */

Admin message