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

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

Subsystems (2)

perf events SPARC + UltraSPARC (sparc/sparc64)

lore

Share & tools

lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot

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

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

perf tools: Move sparc barrier.h stuff to tools/arch/sparc/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/sparc/include/asm/barrier.h             |  8 ++++
 tools/arch/sparc/include/asm/barrier_32.h          |  6 +++
 .../arch}/sparc/include/asm/barrier_64.h           | 47 +++-------------------
 tools/include/asm/barrier.h                        |  2 +
 tools/perf/MANIFEST                                |  3 ++
 tools/perf/perf-sys.h                              |  9 -----
 6 files changed, 25 insertions(+), 50 deletions(-)

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

new file mode 100644
index 0000000..8c017b3
@@ -0,0 +1,8 @@
+#ifndef ___TOOLS_LINUX_ASM_SPARC_BARRIER_H
+#define ___TOOLS_LINUX_ASM_SPARC_BARRIER_H
+#if defined(__sparc__) && defined(__arch64__)
+#include "barrier_64.h"
+#else
+#include "barrier_32.h"
+#endif
+#endif

tools/arch/sparc/include/asm/barrier_32.h new file +6 -0

new file mode 100644
index 0000000..c5eadd0
@@ -0,0 +1,6 @@
+#ifndef __TOOLS_PERF_SPARC_BARRIER_H
+#define __TOOLS_PERF_SPARC_BARRIER_H
+
+#include <asm-generic/barrier.h>
+
+#endif /* !(__TOOLS_PERF_SPARC_BARRIER_H) */

tools/arch/sparc/include/asm/barrier_64.h renamed from arch/sparc/include/asm/barrier_64.h +6 ~~-41~~

54 lines not on this page · raw message

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

index 1338c8a..87f6309 100644
@@ -6,4 +6,6 @@
 #include "../../arch/s390/include/asm/barrier.h"
 #elif defined(__sh__)
 #include "../../arch/sh/include/asm/barrier.h"
+#elif defined(__sparc__)
+#include "../../arch/sparc/include/asm/barrier.h"
 #endif

tools/perf/MANIFEST +3 -0

index 2ceb1b2..ee69240 100644
@@ -2,6 +2,9 @@ tools/perf
 tools/arch/powerpc/include/asm/barrier.h
 tools/arch/s390/include/asm/barrier.h
 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/x86/include/asm/barrier.h
 tools/scripts
 tools/build

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

index 7ef5e82..b3e911a 100644
@@ -57,15 +57,6 @@
 #endif
 
 #ifdef __sparc__
-#ifdef __LP64__
-#define mb()		asm volatile("ba,pt %%xcc, 1f\n"	\
-				     "membar #StoreLoad\n"	\
-				     "1:\n":::"memory")
-#else
-#define mb()		asm volatile("":::"memory")
-#endif
-#define wmb()		asm volatile("":::"memory")
-#define rmb()		asm volatile("":::"memory")
 #define CPUINFO_PROC	{"cpu"}
 #endif