[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-vsjbiydh15pfqomxw1kx64ex@git.kernel.org>
Date: Wed, 24 Jan 2018 03:21:41 -0800
From: tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: mingo@...nel.org, acme@...hat.com, adrian.hunter@...el.com,
udknight@...il.com, hpa@...or.com, wangnan0@...wei.com,
tglx@...utronix.de, linux-kernel@...r.kernel.org,
namhyung@...nel.org, jolsa@...nel.org,
alexander.shishkin@...ux.intel.com, dsahern@...il.com
Subject: [tip:perf/core] perf tools: Move conditional O_CLOEXEC to util.h
Commit-ID: 5c61d70e55ab1cb917752f4a0d5f4683b4869e32
Gitweb: https://git.kernel.org/tip/5c61d70e55ab1cb917752f4a0d5f4683b4869e32
Author: Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Mon, 22 Jan 2018 17:11:30 -0300
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Tue, 23 Jan 2018 09:48:20 -0300
perf tools: Move conditional O_CLOEXEC to util.h
To be more generally available and get the build on centos:5 to
work after we use O_CLOEXEC in the next patch, in the util/dso.c file.
Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Wang Nan <wangnan0@...wei.com>
Cc: Wang YanQing <udknight@...il.com>
Link: https://lkml.kernel.org/n/tip-vsjbiydh15pfqomxw1kx64ex@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/util/data.c | 10 ----------
tools/perf/util/util.h | 10 ++++++++++
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
index 48094fd..d8cfc19 100644
--- a/tools/perf/util/data.c
+++ b/tools/perf/util/data.c
@@ -12,16 +12,6 @@
#include "util.h"
#include "debug.h"
-#ifndef O_CLOEXEC
-#ifdef __sparc__
-#define O_CLOEXEC 0x400000
-#elif defined(__alpha__) || defined(__hppa__)
-#define O_CLOEXEC 010000000
-#else
-#define O_CLOEXEC 02000000
-#endif
-#endif
-
static bool check_pipe(struct perf_data *data)
{
struct stat st;
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 0143450..9496365 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -68,4 +68,14 @@ extern bool perf_singlethreaded;
void perf_set_singlethreaded(void);
void perf_set_multithreaded(void);
+#ifndef O_CLOEXEC
+#ifdef __sparc__
+#define O_CLOEXEC 0x400000
+#elif defined(__alpha__) || defined(__hppa__)
+#define O_CLOEXEC 010000000
+#else
+#define O_CLOEXEC 02000000
+#endif
+#endif
+
#endif /* GIT_COMPAT_UTIL_H */
Powered by blists - more mailing lists