| From f428ebd184c82a7914b2aa7e9f868918aaf7ea78 Mon Sep 17 00:00:00 2001 |
| From: Peter Zijlstra <peterz@infradead.org> |
| Date: Fri, 24 Jan 2014 16:40:02 +0100 |
| Subject: perf tools: Fix AAAAARGH64 memory barriers |
| |
| From: Peter Zijlstra <peterz@infradead.org> |
| |
| commit f428ebd184c82a7914b2aa7e9f868918aaf7ea78 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/perf/perf.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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 |
| |
