tools/perf: Fix AAAAARGH64 memory barriers
Peter Zijlstra
maintainerSomeone got the load and store barriers mixed up for AAAAARGH64. Turn them the right side up.
Fixes a94d342b9cb0 ("tools/perf: Add required memory barriers")
Reported-by Will Deacon <[email protected]>
Signed-off-by Peter Zijlstra <[email protected]>
--- tools/perf/perf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/perf.h +2 -2
@@ -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
tip-bot for Peter Zijlstra
merge bot[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.
Reported-by Will Deacon <[email protected]>
Signed-off-by Peter Zijlstra <[email protected]>
Fixes a94d342b9cb0 ("tools/perf: Add required memory barriers")
Cc Ingo Molnar <[email protected]>
Cc Will Deacon <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/perf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/perf.h +2 -2
@@ -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