diff options
| author | David S. Miller <davem@davemloft.net> | 2016-02-01 18:44:07 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-01 18:44:07 -0800 |
| commit | b45efa30a626e915192a6c548cd8642379cd47cc (patch) | |
| tree | 90d8b43ebceb850b0e7852d75283aebbd2abbc00 /arch/x86/um/asm/barrier.h | |
| parent | 7a26019fdecdb45ff784ae4e3b7e0cc9045100ca (diff) | |
| parent | 34229b277480f46c1e9a19f027f30b074512e68b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/x86/um/asm/barrier.h')
| -rw-r--r-- | arch/x86/um/asm/barrier.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/um/asm/barrier.h b/arch/x86/um/asm/barrier.h index 755481f14d90..174781a404ff 100644 --- a/arch/x86/um/asm/barrier.h +++ b/arch/x86/um/asm/barrier.h @@ -36,13 +36,6 @@ #endif /* CONFIG_X86_PPRO_FENCE */ #define dma_wmb() barrier() -#define smp_mb() barrier() -#define smp_rmb() barrier() -#define smp_wmb() barrier() - -#define smp_store_mb(var, value) do { WRITE_ONCE(var, value); barrier(); } while (0) - -#define read_barrier_depends() do { } while (0) -#define smp_read_barrier_depends() do { } while (0) +#include <asm-generic/barrier.h> #endif |