Commit-ID: 42b09d7b0e3d57a92b938fde5fcb532e9a88e1ea Gitweb: http://git.kernel.org/tip/42b09d7b0e3d57a92b938fde5fcb532e9a88e1ea Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 7 May 2015 17:17:17 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 8 May 2015 16:05:08 -0300
perf tools: Move generic barriers out of perf-sys.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. The parisc stuff was just using the asm-generic/barrier.h, no need to introduce a tools/arch/parisc/ tree just yet. 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] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> --- tools/include/asm/barrier.h | 2 ++ tools/perf/perf-sys.h | 9 --------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tools/include/asm/barrier.h b/tools/include/asm/barrier.h index c23fff3..ac66ac5 100644 --- a/tools/include/asm/barrier.h +++ b/tools/include/asm/barrier.h @@ -22,4 +22,6 @@ #include "../../arch/ia64/include/asm/barrier.h" #elif defined(__xtensa__) #include "../../arch/xtensa/include/asm/barrier.h" +#else +#include <asm-generic/barrier.h> #endif diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h index e5be325..83a25ce 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -50,9 +50,6 @@ #endif #ifdef __hppa__ -#define mb() asm volatile("" ::: "memory") -#define wmb() asm volatile("" ::: "memory") -#define rmb() asm volatile("" ::: "memory") #define CPUINFO_PROC {"cpu"} #endif @@ -82,16 +79,10 @@ #endif #ifdef __arc__ -#define mb() asm volatile("" ::: "memory") -#define wmb() asm volatile("" ::: "memory") -#define rmb() asm volatile("" ::: "memory") #define CPUINFO_PROC {"Processor"} #endif #ifdef __metag__ -#define mb() asm volatile("" ::: "memory") -#define wmb() asm volatile("" ::: "memory") -#define rmb() asm volatile("" ::: "memory") #define CPUINFO_PROC {"CPU"} #endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
