From 5fc0a4629f9e0afe018d51b09cbe7ee6710e2112 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Mon, 21 Dec 2015 09:22:18 +0200 Subject: [PATCH] x86: reuse asm-generic/barrier.h Orabug: 26668113 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 Acked-by: Arnd Bergmann Acked-by: Peter Zijlstra (Intel) Reviewed-by: Thomas Gleixner (cherry picked from commit 300b06d4555305dc227748674f75970f2f84c224) Signed-off-by: Somasundaram Krishnasamy Reviewed-by: Jack Vogel Conflicts: arch/x86/include/asm/barrier.h --- arch/x86/include/asm/barrier.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index 959e45b81fe2..d89d0c52d504 100644 --- a/arch/x86/include/asm/barrier.h +++ b/arch/x86/include/asm/barrier.h @@ -43,9 +43,6 @@ #define set_mb(var, value) do { 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) /* @@ -101,5 +98,6 @@ static __always_inline void rdtsc_barrier(void) alternative_2("", "mfence", X86_FEATURE_MFENCE_RDTSC, "lfence", X86_FEATURE_LFENCE_RDTSC); } +#include #endif /* _ASM_X86_BARRIER_H */ -- 2.50.1