perf tools: Move xtensa barrier.h stuff to tools/ arch/xtensa/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 Tensilica Xtensa port (xtensa)

lore

Share & tools

lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot

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

Commit-ID:  3d3337de8900a199a7ab304f742a6ad2a973b9f4
Gitweb:     http://git.kernel.org/tip/3d3337de8900a199a7ab304f742a6ad2a973b9f4
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Fri, 8 May 2015 08:53:26 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 8 May 2015 16:05:07 -0300

perf tools: Move xtensa barrier.h stuff to tools/arch/xtensa/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]>

---
 {arch => tools/arch}/xtensa/include/asm/barrier.h | 13 +++++--------
 tools/include/asm/barrier.h                       |  2 ++
 tools/perf/MANIFEST                               |  1 +
 tools/perf/perf-sys.h                             |  3 ---
 4 files changed, 8 insertions(+), 11 deletions(-)

tools/arch/xtensa/include/asm/barrier.h renamed from arch/xtensa/include/asm/barrier.h +5 -8

similarity index 62%
copy from arch/xtensa/include/asm/barrier.h
copy to tools/arch/xtensa/include/asm/barrier.h
index 5b88774..583800b 100644
@@ -1,4 +1,6 @@
 /*
+ * Copied from the kernel sources to tools/:
+ *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.

@@ -6,16 +8,11 @@
  * Copyright (C) 2001 - 2012 Tensilica Inc.
  */
 
-#ifndef _XTENSA_SYSTEM_H
-#define _XTENSA_SYSTEM_H
+#ifndef _TOOLS_LINUX_XTENSA_SYSTEM_H
+#define _TOOLS_LINUX_XTENSA_SYSTEM_H
 
 #define mb()  ({ __asm__ __volatile__("memw" : : : "memory"); })
 #define rmb() barrier()
 #define wmb() mb()
 
-#define smp_mb__before_atomic()		barrier()
-#define smp_mb__after_atomic()		barrier()
-
-#include <asm-generic/barrier.h>
-
-#endif /* _XTENSA_SYSTEM_H */
+#endif /* _TOOLS_LINUX_XTENSA_SYSTEM_H */

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

index d2ddca50..ccb2244 100644
@@ -16,4 +16,6 @@
 #include "../../arch/alpha/include/asm/barrier.h"
 #elif defined(__ia64__)
 #include "../../arch/ia64/include/asm/barrier.h"
+#elif defined(__xtensa__)
+#include "../../arch/xtensa/include/asm/barrier.h"
 #endif

tools/perf/MANIFEST +1 -0

index 1b330dd..6d3c398 100644
@@ -9,6 +9,7 @@ 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/arch/xtensa/include/asm/barrier.h
 tools/scripts
 tools/build
 tools/lib/traceevent

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

index 56edbe1..ebe228f 100644
@@ -105,9 +105,6 @@
 #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