summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2015-12-21 09:22:18 +0200
committerMichael S. Tsirkin <mst@redhat.com>2016-01-12 20:46:52 +0200
commit300b06d4555305dc227748674f75970f2f84c224 (patch)
tree32f77a1e30af1f54cbbccb74a7c5f8c9cfc5a904
parent577f183acc88645eae116326cc2203dc88ea730c (diff)
downloadlinux-stable-300b06d4555305dc227748674f75970f2f84c224.tar.gz
linux-stable-300b06d4555305dc227748674f75970f2f84c224.tar.bz2
linux-stable-300b06d4555305dc227748674f75970f2f84c224.zip
x86: reuse asm-generic/barrier.h
As on most architectures, on x86 read_barrier_depends and smp_read_barrier_depends are empty. Drop the local definitions and pull the generic ones from asm-generic/barrier.h instead: they are identical. 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> Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/include/asm/barrier.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
index 0681d2532527..cc4c2a77bd01 100644
--- a/arch/x86/include/asm/barrier.h
+++ b/arch/x86/include/asm/barrier.h
@@ -43,9 +43,6 @@
#define smp_store_mb(var, value) do { WRITE_ONCE(var, value); barrier(); } while (0)
#endif /* SMP */
-#define read_barrier_depends() do { } while (0)
-#define smp_read_barrier_depends() do { } while (0)
-
#if defined(CONFIG_X86_PPRO_FENCE)
/*
@@ -91,4 +88,6 @@ do { \
#define smp_mb__before_atomic() barrier()
#define smp_mb__after_atomic() barrier()
+#include <asm-generic/barrier.h>
+
#endif /* _ASM_X86_BARRIER_H */