summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2015-12-27 15:04:42 +0200
committerMichael S. Tsirkin <mst@redhat.com>2016-01-26 10:18:29 +0200
commitfb9b050ce9695cf2769a850d94aa2ab39c8c3cd5 (patch)
tree1ce0cd003c4c6d8cb5d42130e47fa7b9c078a6ea
parenta7c490333df3cff5086ddf19a0837529304fa097 (diff)
downloadlinux-fb9b050ce9695cf2769a850d94aa2ab39c8c3cd5.tar.gz
linux-fb9b050ce9695cf2769a850d94aa2ab39c8c3cd5.tar.bz2
linux-fb9b050ce9695cf2769a850d94aa2ab39c8c3cd5.zip
sh: fix smp_store_mb for !SMP
sh variant of smp_store_mb() calls xchg() on !SMP which is stronger than implied by both the name and the documentation. commit 90a3ccb0be538a914e6a5c51ae919762261563ad ("sh: define __smp_xxx, fix smp_store_mb for !SMP") was supposed to fix it but left the bug in place. Drop smp_store_mb, so that code in asm-generic/barrier.h will define it correctly depending on CONFIG_SMP. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-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>