Merge remote-tracking branches 'asoc/fix/blackfin', 'asoc/fix/da9055', 'asoc/fix...

[firefly-linux-kernel-4.4.55.git] / tools / perf / perf.h

diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 3c2f213e979d45d5d1d2c701a6f2b8875e36e13a..e84fa26bc1bec472e65696b1649656bb4cae3af4 100644 (file)
--- 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
 
@@ -132,6 +132,13 @@
 #define CPUINFO_PROC   "CPU"
 #endif
 
+#ifdef __xtensa__
+#define mb()           asm volatile("memw" ::: "memory")
+#define wmb()          asm volatile("memw" ::: "memory")
+#define rmb()          asm volatile("" ::: "memory")
+#define CPUINFO_PROC   "core ID"
+#endif
+
 #define barrier() asm volatile ("" ::: "memory")
 
 #ifndef cpu_relax