[tip:perf/core] perf tools: Move ACCESS_ONCE from perf.h header

From: tip-bot for Jiri Olsa
Date: Mon May 05 2014 - 13:50:48 EST


Commit-ID: 73a31b7c6a85e2f033524058bad5bce900e4f2ed
Gitweb: http://git.kernel.org/tip/73a31b7c6a85e2f033524058bad5bce900e4f2ed
Author: Jiri Olsa <jolsa@xxxxxxxxxx>
AuthorDate: Mon, 5 May 2014 13:16:41 +0200
Committer: Jiri Olsa <jolsa@xxxxxxxxxx>
CommitDate: Mon, 5 May 2014 17:49:07 +0200

perf tools: Move ACCESS_ONCE from perf.h header

Into tools/include/linux/compiler.h header.

Acked-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Acked-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Link: http://lkml.kernel.org/n/tip-9sk90owm370kuq3f0ssjjui2@xxxxxxxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
tools/include/linux/compiler.h | 2 ++
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 fbc6665..88461f0 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 813571b..510c65f 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/