Skip to contentSkip to conversation

perf namespaces: Move the conditional setns() prototype to namespaces.h

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jul 13, 2019 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  245aec7f7f4ca95b924f005d604bab9d838b5eb1
Gitweb:     https://git.kernel.org/tip/245aec7f7f4ca95b924f005d604bab9d838b5eb1
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Fri, 5 Jul 2019 13:59:06 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 9 Jul 2019 10:13:26 -0300

perf namespaces: Move the conditional setns() prototype to namespaces.h

Out of util.h, to reduce its scope, and since we have a namespaces.h header, much better to have it there, where it is related to.

---
 tools/perf/util/namespaces.h | 4 ++++
 tools/perf/util/setns.c      | 4 +++-
 tools/perf/util/util.h       | 4 ----
 3 files changed, 7 insertions(+), 5 deletions(-)
tools/perf/util/namespaces.h +4 -0
index 15a5a276c478..004430c0de93 100644
@@ -13,6 +13,10 @@
 #include <linux/refcount.h>
 #include <linux/types.h>
 
+#ifndef HAVE_SETNS_SUPPORT
+int setns(int fd, int nstype);
+#endif
+
 struct namespaces_event;
 
 struct namespaces {
tools/perf/util/setns.c +3 -1
index ce8fc290fce8..48f9c0af63b2 100644
@@ -1,4 +1,6 @@
-#include "util.h"
+// SPDX-License-Identifier: LGPL-2.1
+
+#include "namespaces.h"
 #include <unistd.h>
 #include <sys/syscall.h>
 
tools/perf/util/util.h +0 -4
index 125e215dd3d8..59fe33708090 100644
@@ -67,10 +67,6 @@ char *get_current_dir_name(void);
 int sched_getcpu(void);
 #endif
 
-#ifndef HAVE_SETNS_SUPPORT
-int setns(int fd, int nstype);
-#endif
-
 extern bool perf_singlethreaded;
 
 void perf_set_singlethreaded(void);