Skip to contentSkip to conversation

tools/perf: Fix AAAAARGH64 memory barriers

PATCH Peter Zijlstra 2 participants 2 messages Jan 24, 2014 – Feb 2, 2014 perf events

lore
Share & tools
lore

Peter Zijlstra

author maintainer
#0 lore raw

Someone got the load and store barriers mixed up for AAAAARGH64. Turn them the right side up.

Fixes a94d342b9cb0 ("tools/perf: Add required memory barriers")
---
 tools/perf/perf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/perf.h +2 -2
index 3c2f213e979d..dd4c0d32fbae 100644
@@ -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
 
#1 lore raw

[tip:perf/urgent] perf tools: Fix AAAAARGH64 memory barriers

perf tools: Fix AAAAARGH64 memory barriers
Commit-ID:  f428ebd184c82a7914b2aa7e9f868918aaf7ea78
Gitweb:     http://git.kernel.org/tip/f428ebd184c82a7914b2aa7e9f868918aaf7ea78
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Fri, 24 Jan 2014 16:40:02 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 29 Jan 2014 15:50:57 -0300

perf tools: Fix AAAAARGH64 memory barriers

Someone got the load and store barriers mixed up for AAAAARGH64. Turn them the right side up.

Fixes a94d342b9cb0 ("tools/perf: Add required memory barriers")
Cc Ingo Molnar <[email protected]>
Cc Will Deacon <[email protected]>
---
 tools/perf/perf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/perf.h +2 -2
index 7daa806..e84fa26 100644
@@ -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