perf tools: Move alpha barrier.h stuff to tools/ arch/alpha/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:08 UTC #0 lore raw

Commit-ID:  0da85d1e38b4c186d2248f0239b72d465f5b406c
Gitweb:     http://git.kernel.org/tip/0da85d1e38b4c186d2248f0239b72d465f5b406c
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 7 May 2015 17:52:19 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 8 May 2015 16:05:06 -0300

perf tools: Move alpha barrier.h stuff to tools/arch/alpha/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/alpha/include/asm/barrier.h | 8 ++++++++
 tools/include/asm/barrier.h            | 2 ++
 tools/perf/MANIFEST                    | 1 +
 tools/perf/perf-sys.h                  | 3 ---
 4 files changed, 11 insertions(+), 3 deletions(-)

tools/arch/alpha/include/asm/barrier.h new file +8 -0

new file mode 100644
index 0000000..95df19c
@@ -0,0 +1,8 @@
+#ifndef __TOOLS_LINUX_ASM_ALPHA_BARRIER_H
+#define __TOOLS_LINUX_ASM_ALPHA_BARRIER_H
+
+#define mb()	__asm__ __volatile__("mb": : :"memory")
+#define rmb()	__asm__ __volatile__("mb": : :"memory")
+#define wmb()	__asm__ __volatile__("wmb": : :"memory")
+
+#endif		/* __TOOLS_LINUX_ASM_ALPHA_BARRIER_H */

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

index 87f6309..a579a2e 100644
@@ -8,4 +8,6 @@
 #include "../../arch/sh/include/asm/barrier.h"
 #elif defined(__sparc__)
 #include "../../arch/sparc/include/asm/barrier.h"
+#elif defined(__alpha__)
+#include "../../arch/alpha/include/asm/barrier.h"
 #endif

tools/perf/MANIFEST +1 -0

index ee69240..9919ee3 100644
@@ -1,4 +1,5 @@
 tools/perf
+tools/arch/alpha/include/asm/barrier.h
 tools/arch/powerpc/include/asm/barrier.h
 tools/arch/s390/include/asm/barrier.h
 tools/arch/sh/include/asm/barrier.h

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

index b3e911a..4710f057 100644
@@ -61,9 +61,6 @@
 #endif
 
 #ifdef __alpha__
-#define mb()		asm volatile("mb" ::: "memory")
-#define wmb()		asm volatile("wmb" ::: "memory")
-#define rmb()		asm volatile("mb" ::: "memory")
 #define CPUINFO_PROC	{"cpu model"}
 #endif