diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2014-05-05 13:16:41 +0200 |
|---|---|---|
| committer | Jiri Olsa <jolsa@kernel.org> | 2014-05-05 17:49:07 +0200 |
| commit | 73a31b7c6a85e2f033524058bad5bce900e4f2ed (patch) | |
| tree | 9a49847d06c707aa0b441bc88babe76ede3c0de1 | |
| parent | 82baa0eb46c15b749723d0c801470fea044657d7 (diff) | |
perf tools: Move ACCESS_ONCE from perf.h header
Into tools/include/linux/compiler.h header.
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-9sk90owm370kuq3f0ssjjui2@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
| -rw-r--r-- | tools/include/linux/compiler.h | 2 | ||||
| -rw-r--r-- | tools/perf/perf.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h index fbc6665c6d53..88461f09cc86 100644 --- a/tools/include/linux/compiler.h +++ b/tools/include/linux/compiler.h @@ -35,4 +35,6 @@ # define unlikely(x) __builtin_expect(!!(x), 0) #endif +#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x)) + #endif /* _TOOLS_LINUX_COMPILER_H */ diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 813571b07246..510c65f72858 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -14,8 +14,6 @@ void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu, #define HAVE_ATTR_TEST #include "perf-sys.h" -#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x)) - #ifndef NSEC_PER_SEC # define NSEC_PER_SEC 1000000000ULL #endif |