summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2014-01-24 16:40:02 +0100
committerArnaldo Carvalho de Melo <acme@redhat.com>2014-01-29 15:50:57 -0300
commitf428ebd184c82a7914b2aa7e9f868918aaf7ea78 (patch)
treec7a0eb95e556a90fc9e9c534515ba53b8f9868d8 /tools
parent950b8354716eb1f9c0b39777d379efa5f4125c04 (diff)
downloadkernel-common-f428ebd184c82a7914b2aa7e9f868918aaf7ea78.tar.gz
kernel-common-f428ebd184c82a7914b2aa7e9f868918aaf7ea78.tar.bz2
kernel-common-f428ebd184c82a7914b2aa7e9f868918aaf7ea78.zip
perf tools: Fix AAAAARGH64 memory barriers
Someone got the load and store barriers mixed up for AAAAARGH64. Turn them the right side up. Reported-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Fixes: a94d342b9cb0 ("tools/perf: Add required memory barriers") Cc: Ingo Molnar <mingo@kernel.org> Cc: Will Deacon <will.deacon@arm.com> Link: http://lkml.kernel.org/r/20140124154002.GF31570@twins.programming.kicks-ass.net Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/perf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 7daa806d9050..e84fa26bc1be 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -100,8 +100,8 @@
#ifdef __aarch64__
#define mb() asm volatile("dmb ish" ::: "memory")
-#define wmb() asm volatile("dmb ishld" ::: "memory")
-#define rmb() asm volatile("dmb ishst" ::: "memory")
+#define wmb() asm volatile("dmb ishst" ::: "memory")
+#define rmb() asm volatile("dmb ishld" ::: "memory")
#define cpu_relax() asm volatile("yield" ::: "memory")
#endif