Merge tag 'v3.4-rc2' into perf/core

Merge Linux 3.4-rc2: we were on v3.3, update the base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 0 deletions

diff --git a/tools/virtio/linux/virtio.h b/tools/virtio/linux/virtio.h
index b4fbc91c41b4..7579f19e61e0 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