From 07d207ac0c55a413c358153bd3012c5fa51a0554 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo <acme@redhat.com> Date: Wed, 6 May 2015 18:44:53 -0300 Subject: perf tools: Move s390 barrier.h stuff to tools/arch/s390/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 <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-zv4x77074resrkl4ayzf5e7d@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/MANIFEST | 1 + tools/perf/perf-sys.h | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'tools/perf') diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index 4b3346e81d85..00754afb4866 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -1,5 +1,6 @@ tools/perf tools/arch/powerpc/include/asm/barrier.h +tools/arch/s390/include/asm/barrier.h tools/arch/x86/include/asm/barrier.h tools/scripts tools/build diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h index 01c06954bf16..bf349ea3984f 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -42,9 +42,6 @@ #endif #ifdef __s390__ -#define mb() asm volatile("bcr 15,0" ::: "memory") -#define wmb() asm volatile("bcr 15,0" ::: "memory") -#define rmb() asm volatile("bcr 15,0" ::: "memory") #define CPUINFO_PROC {"vendor_id"} #endif -- cgit v1.2.3-58-ga151