perf tools: Move tile barrier.h stuff to tools/ arch/tile/include/asm/barrier.h

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message May 10, 2015 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2015-05-10 07:09 UTC #0 lore raw

Commit-ID:  d3bd708114a37bcb472715818ba21d61ef71e86a
Gitweb:     http://git.kernel.org/tip/d3bd708114a37bcb472715818ba21d61ef71e86a
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Fri, 8 May 2015 10:02:00 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 8 May 2015 16:05:08 -0300

perf tools: Move tile barrier.h stuff to tools/arch/tile/include/asm/barrier.h

We will need it for atomic.h, so move it from the ad-hoc tools/perf/ place to a tools/ subset of the kernel arch/ hierarchy.

Cc Adrian Hunter <[email protected]>

Cc Borislav Petkov <[email protected]>

Cc David Ahern <[email protected]>

Cc Don Zickus <[email protected]>

Cc Frederic Weisbecker <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Stephane Eranian <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/arch/tile/include/asm/barrier.h | 15 +++++++++++++++
 tools/include/asm/barrier.h           |  2 ++
 tools/perf/MANIFEST                   |  1 +
 tools/perf/perf-sys.h                 |  3 ---
 4 files changed, 18 insertions(+), 3 deletions(-)

tools/arch/tile/include/asm/barrier.h new file +15 -0

new file mode 100644
index 0000000..7d3692c
@@ -0,0 +1,15 @@
+#ifndef _TOOLS_LINUX_ASM_TILE_BARRIER_H
+#define _TOOLS_LINUX_ASM_TILE_BARRIER_H
+/*
+ * FIXME: This came from tools/perf/perf-sys.h, where it was first introduced
+ * in 620830b6954913647b7c7f68920cf48eddf6ad92, more work needed to make it
+ * more closely follow the Linux kernel arch/tile/include/asm/barrier.h file.
+ * Probably when we continue work on tools/ Kconfig support to have all the
+ * CONFIG_ needed for properly doing that.
+ */
+
+#define mb()		asm volatile ("mf" ::: "memory")
+#define wmb()		mb()
+#define rmb()		mb()
+
+#endif /* _TOOLS_LINUX_ASM_TILE_BARRIER_H */

tools/include/asm/barrier.h +2 -0

index a00b948..c23fff3 100644
@@ -12,6 +12,8 @@
 #include "../../arch/sh/include/asm/barrier.h"
 #elif defined(__sparc__)
 #include "../../arch/sparc/include/asm/barrier.h"
+#elif defined(__tile__)
+#include "../../arch/tile/include/asm/barrier.h"
 #elif defined(__alpha__)
 #include "../../arch/alpha/include/asm/barrier.h"
 #elif defined(__mips__)

tools/perf/MANIFEST +1 -0

index e4a7220..7ef14d4 100644
@@ -9,6 +9,7 @@ tools/arch/sh/include/asm/barrier.h
 tools/arch/sparc/include/asm/barrier.h
 tools/arch/sparc/include/asm/barrier_32.h
 tools/arch/sparc/include/asm/barrier_64.h
+tools/arch/tile/include/asm/barrier.h
 tools/arch/x86/include/asm/barrier.h
 tools/arch/xtensa/include/asm/barrier.h
 tools/scripts

tools/perf/perf-sys.h +0 -3

index 876001e..e5be325 100644
@@ -100,9 +100,6 @@
 #endif
 
 #ifdef __tile__
-#define mb()		asm volatile ("mf" ::: "memory")
-#define wmb()		asm volatile ("mf" ::: "memory")
-#define rmb()		asm volatile ("mf" ::: "memory")
 #define cpu_relax()	asm volatile ("mfspr zero, PASS" ::: "memory")
 #define CPUINFO_PROC    {"model name"}
 #endif