Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42b09d7b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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 <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-tfas9bs1gje0hfsvhqgrosd6@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d3bd7081

tools/include/asm/barrier.h

+2 −0
Original line number Diff line number Diff line
@@ -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

tools/perf/perf-sys.h

+0 −9
Original line number Diff line number Diff line
@@ -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