summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-23 14:46:48 -0400
committerDavid S. Miller <davem@davemloft.net>2012-03-23 14:46:48 -0400
commitf1e84eb3bba3d6a5691ce1832ff7e550768560d8 (patch)
treeaadec1eb55b0281cba4701b85835b2bc4502a9cc /tools
parent8c6b0865aa80c4f30baa343d3d707389f738af48 (diff)
parentea5d404655ba3b356d0c06d6a3c4f24112124522 (diff)
downloadlinux-3.10-f1e84eb3bba3d6a5691ce1832ff7e550768560d8.tar.gz
linux-3.10-f1e84eb3bba3d6a5691ce1832ff7e550768560d8.tar.bz2
linux-3.10-f1e84eb3bba3d6a5691ce1832ff7e550768560d8.zip
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'tools')
-rw-r--r--tools/virtio/linux/hrtimer.h0
-rw-r--r--tools/virtio/linux/module.h0
-rw-r--r--tools/virtio/linux/virtio.h3
3 files changed, 3 insertions, 0 deletions
diff --git a/tools/virtio/linux/hrtimer.h b/tools/virtio/linux/hrtimer.h
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/tools/virtio/linux/hrtimer.h
diff --git a/tools/virtio/linux/module.h b/tools/virtio/linux/module.h
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/tools/virtio/linux/module.h
diff --git a/tools/virtio/linux/virtio.h b/tools/virtio/linux/virtio.h
index b4fbc91c41b..7579f19e61e 100644
--- a/tools/virtio/linux/virtio.h
+++ b/tools/virtio/linux/virtio.h
@@ -181,6 +181,9 @@ struct virtqueue {
#define smp_mb() mb()
# define smp_rmb() barrier()
# define smp_wmb() barrier()
+/* Weak barriers should be used. If not - it's a bug */
+# define rmb() abort()
+# define wmb() abort()
#else
#error Please fill in barrier macros
#endif