summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2019-09-11 14:51:19 +0200
committerRichard Weinberger <richard@nod.at>2019-09-15 21:37:14 +0200
commit851b6cb17c9912bc0cb452e477c04542b01db51b (patch)
treee2acef78c752a9c0c7d1dfafa626907ecb27c8ab
parenta30cc14fe49c2d5913caf6b987d7cbd86c5e370b (diff)
downloadlinux-851b6cb17c9912bc0cb452e477c04542b01db51b.tar.bz2
um: Use real DMA barriers
When we have virtio enabled, we must have real barriers since we may be running on an SMP machine (quite likely are, in fact), so the other process can be on another CPU. Since in any other case we don't really use DMA barriers, remove their override completely so real barriers will get used. In the future we might need them for other cases as well. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r--arch/x86/um/asm/barrier.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/um/asm/barrier.h b/arch/x86/um/asm/barrier.h
index eb0654f39fd2..165be7f9a964 100644
--- a/arch/x86/um/asm/barrier.h
+++ b/arch/x86/um/asm/barrier.h
@@ -23,9 +23,6 @@
#endif /* CONFIG_X86_32 */
-#define dma_rmb() barrier()
-#define dma_wmb() barrier()
-
#include <asm-generic/barrier.h>
#endif