diff options
| author |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-05-07 13:38:16 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-05-08 16:05:04 -0300 |
| commit | 5ac69737dc5e25fb1c26d18059c8e17ce2671d5d (patch) | |
| tree | 391e80d406a2021c18e74354397775a3f21b888f | |
| parent | perf tools: Move s390 barrier.h stuff to tools/arch/s390/include/asm/barrier.h (diff) | |
| download | wireguard-linux-5ac69737dc5e25fb1c26d18059c8e17ce2671d5d.tar.xz wireguard-linux-5ac69737dc5e25fb1c26d18059c8e17ce2671d5d.zip | |
perf tools: Move barrier() definition to tools/include/linux/compiler.h
To make it generally accessible by other tools/ projects, also will be
used in the tools/arch/*/include/asm/barrier.h files that are being
introduced now.
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-qnjdqwu3vcnt14vqmr6wu788@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/include/linux/compiler.h | 4 | ||||
| -rw-r--r-- | tools/perf/perf-sys.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h index 88461f09cc86..f0e72674c52d 100644 --- a/tools/include/linux/compiler.h +++ b/tools/include/linux/compiler.h @@ -1,6 +1,10 @@ #ifndef _TOOLS_LINUX_COMPILER_H_ #define _TOOLS_LINUX_COMPILER_H_ +/* Optimization barrier */ +/* The "volatile" is due to gcc bugs */ +#define barrier() __asm__ __volatile__("": : :"memory") + #ifndef __always_inline # define __always_inline inline __attribute__((always_inline)) #endif diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h index bf349ea3984f..f44e53efd9a4 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -153,8 +153,6 @@ #define CPUINFO_PROC {"model name"} #endif -#define barrier() asm volatile ("" ::: "memory") - #ifndef cpu_relax #define cpu_relax() barrier() #endif |