arch,x86: Convert smp_mb__*()

[firefly-linux-kernel-4.4.55.git] / arch / x86 / include / asm / atomic.h

diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
index b17f4f48ecd7d9a48646a295c7ffaaa544399fa8..6dd1c7dd0473aecbaa1af28377878a36ac3dfa73 100644 (file)
--- a/arch/x86/include/asm/atomic.h
+++ b/arch/x86/include/asm/atomic.h
@@ -7,6 +7,7 @@
 #include <asm/alternative.h>
 #include <asm/cmpxchg.h>
 #include <asm/rmwcc.h>
+#include <asm/barrier.h>
 
 /*
  * Atomic operations that C can't guarantee us.  Useful for
@@ -243,12 +244,6 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
                     : : "r" ((unsigned)(mask)), "m" (*(addr))  \
                     : "memory")
 
-/* Atomic operations are already serializing on x86 */
-#define smp_mb__before_atomic_dec()    barrier()
-#define smp_mb__after_atomic_dec()     barrier()
-#define smp_mb__before_atomic_inc()    barrier()
-#define smp_mb__after_atomic_inc()     barrier()
-
 #ifdef CONFIG_X86_32
 # include <asm/atomic64_32.h>
 #else