summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-27 11:56:03 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-27 11:56:03 -0800
commit03c21cb775a313f1ff19be59c5d02df3e3526471 (patch)
tree9334631e728a063664a80d044c32849f2a2aa3b9 /arch
parent075356c1cf59e37368f60cd68bdc99a6e2e46d83 (diff)
parent481eaec37e91e2b33f17275901172f50ce2c71e8 (diff)
downloadlinux-03c21cb775a313f1ff19be59c5d02df3e3526471.tar.bz2
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio tests and fixes from Michael Tsirkin: "This fixes existing tests broken by barrier rework, and adds some new tests. Plus, there's a fix for an old bug in virtio-pci" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: tools/virtio: add ringtest utilities sh: fix smp_store_mb for !SMP tools/virtio: use virt_xxx barriers virtio_pci: fix use after free on release
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/include/asm/barrier.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/include/asm/barrier.h b/arch/sh/include/asm/barrier.h
index f887c6465a82..8a84e05adb2e 100644
--- a/arch/sh/include/asm/barrier.h
+++ b/arch/sh/include/asm/barrier.h
@@ -33,7 +33,6 @@
#endif
#define __smp_store_mb(var, value) do { (void)xchg(&var, value); } while (0)
-#define smp_store_mb(var, value) __smp_store_mb(var, value)
#include <asm-generic/barrier.h>