Revert "virtio_ring: Update weak barriers to use dma_wmb/rmb"

[cascardo/linux.git] / include / linux / virtio_ring.h

diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index 8e50888..67e06fe 100644 (file)
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -21,20 +21,19 @@
  * actually quite cheap.
  */
 
+#ifdef CONFIG_SMP
 static inline void virtio_mb(bool weak_barriers)
 {
-#ifdef CONFIG_SMP
        if (weak_barriers)
                smp_mb();
        else
-#endif
                mb();
 }
 
 static inline void virtio_rmb(bool weak_barriers)
 {
        if (weak_barriers)
-               dma_rmb();
+               smp_rmb();
        else
                rmb();
 }
@@ -42,10 +41,26 @@ static inline void virtio_rmb(bool weak_barriers)
 static inline void virtio_wmb(bool weak_barriers)
 {
        if (weak_barriers)
-               dma_wmb();
+               smp_wmb();
        else
                wmb();
 }
+#else
+static inline void virtio_mb(bool weak_barriers)
+{
+       mb();
+}
+
+static inline void virtio_rmb(bool weak_barriers)
+{
+       rmb();
+}
+
+static inline void virtio_wmb(bool weak_barriers)
+{
+       wmb();
+}
+#endif
 
 struct virtio_device;
 struct virtqueue;